[LyX/master] installer/setup/configure.nsh: revert an unwanted commit part

[Uwe Stöhr]

commit 84863eb1b03de97b8445f6cfa633e361a4d7f769
Author: Uwe Stöhr 
Date:   Thu Mar 21 02:45:21 2019 +0100

installer/setup/configure.nsh: revert an unwanted commit part
---
 .../Win32/packaging/installer/setup/configure.nsh  |   24 
 1 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/development/Win32/packaging/installer/setup/configure.nsh 
b/development/Win32/packaging/installer/setup/configure.nsh
index 7fc6a32..97bc945 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -233,30 +233,6 @@ Var ConfigureReturn
 
 Section -ConfigureScript
 
-  SetOutPath "$INSTDIR\Resources"
-  
-  # ask to update MiKTeX
-  ${if} $LaTeXInstalled == "MiKTeX"
-   Call UpdateMiKTeX # function from latex.nsh
-   # install all necessary packages at once because this is much faster then 
to install the packages one by one
-   DetailPrint $(TEXT_CONFIGURE_LYX)
-   ${if} $MultiUser.Privileges != "Admin"
-   ${andif} $MultiUser.Privileges != "Power"
-# call the non-admin version
-# at first we need to synchronize the package database
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" 
"--require=@$INSTDIR\Resources\Packages.txt"'
-   ${else}
-${if} $MiKTeXUser != "HKCU" # call the admin version
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" 
"--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" 
"--require=@$INSTDIR\Resources\Packages.txt"'
-${else}
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" 
"--require=@$INSTDIR\Resources\Packages.txt"'
-${endif}
-   ${endif}
-  ${endif}
-  
   DetailPrint $(TEXT_CONFIGURE_LYX)
   nsExec::ExecToLog '"$INSTDIR\Python\python.exe" 
"$INSTDIR\Resources\configure.py"'
   # $ConfigureReturn is "0" if successful, otherwise "1"

[LyX/master] installer: remove unsupported TeX distributions

[Uwe Stöhr]

commit aca0abc7b035d2c6f59d503b00205dc014938e1e
Author: Uwe Stöhr 
Date:   Fri Mar 22 01:06:56 2019 +0100

installer: remove unsupported TeX distributions

MiKTeX 2.8 and TeXLive 2014 are since a while not supported
---
 .../Win32/packaging/installer/include/LaTeX.nsh|   19 ---
 1 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh 
b/development/Win32/packaging/installer/include/LaTeX.nsh
index d7e527b..a94f269 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -54,10 +54,6 @@ Function LaTeXActions
 IntOp $0 $0 + 1
 Goto loop32
done32:
-   ${if} $String == "2.8"
-StrCpy $MiKTeXVersion "2.8"
-StrCpy $LaTeXName "MiKTeX 2.8"
-   ${endif}
${if} $String == "2.9"
 StrCpy $MiKTeXVersion "2.9"
 StrCpy $LaTeXName "MiKTeX 2.9"
@@ -78,10 +74,6 @@ Function LaTeXActions
 IntOp $0 $0 + 1
 Goto loop64
done64:
-   ${if} $String == "2.8"
-StrCpy $MiKTeXVersion "2.8"
-StrCpy $LaTeXName "MiKTeX 2.8"
-   ${endif}
${if} $String == "2.9"
 StrCpy $MiKTeXVersion "2.9"
 StrCpy $LaTeXName "MiKTeX 2.9"
@@ -110,10 +102,6 @@ Function LaTeXActions
 IntOp $0 $0 + 1
 Goto loopB
doneB:
-   ${if} $String == "2.8"
-StrCpy $MiKTeXVersion "2.8"
-StrCpy $LaTeXName "MiKTeX 2.8"
-   ${endif}
${if} $String == "2.9"
 StrCpy $MiKTeXVersion "2.9"
 StrCpy $LaTeXName "MiKTeX 2.9"
@@ -176,19 +164,12 @@ Function LaTeXActions
   ${endif}
   # finally set the name
   ${if} $PathLaTeX != ""
-  ${andif} $LaTeXName != "MiKTeX 2.8"
   ${andif} $LaTeXName != "MiKTeX 2.9"
StrCpy $LaTeXInstalled "TeXLive"
ReadRegStr $String HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015" 
"DisplayVersion"
${if} $String == ""
 ReadRegStr $String HKCU 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015" 
"DisplayVersion"
${endif}
-   ${if} $String == ""
-ReadRegStr $String HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2014" 
"DisplayVersion"
-   ${endif}
-   ${if} $String == ""
-ReadRegStr $String HKCU 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2014" 
"DisplayVersion"
-   ${endif}
${if} $String != ""
 StrCpy $LaTeXName "TeXLive $String"
${else}

[LyX/master] installer: fix a display issue

[Uwe Stöhr]

commit 3aaa6078fd6a16dbb2f023c182468fa44fc4f2ec
Author: Uwe Stöhr 
Date:   Fri Mar 22 01:18:04 2019 +0100

installer: fix a display issue

a path in the uninstaller was not visible because of missing line breaks
---
 .../Win32/packaging/installer/lang/arabic.nsh  |4 +++-
 .../Win32/packaging/installer/lang/basque.nsh  |4 +++-
 .../Win32/packaging/installer/lang/catalan.nsh |4 +++-
 .../Win32/packaging/installer/lang/czech.nsh   |4 +++-
 .../Win32/packaging/installer/lang/danish.nsh  |4 +++-
 .../Win32/packaging/installer/lang/dutch.nsh   |4 +++-
 .../Win32/packaging/installer/lang/english.nsh |8 +---
 .../Win32/packaging/installer/lang/french.nsh  |4 +++-
 .../Win32/packaging/installer/lang/galician.nsh|4 +++-
 .../Win32/packaging/installer/lang/german.nsh  |4 +++-
 .../Win32/packaging/installer/lang/hungarian.nsh   |4 +++-
 .../Win32/packaging/installer/lang/indonesian.nsh  |4 +++-
 .../Win32/packaging/installer/lang/italian.nsh |4 +++-
 .../Win32/packaging/installer/lang/japanese.nsh|4 +++-
 .../Win32/packaging/installer/lang/norwegian.nsh   |4 +++-
 .../Win32/packaging/installer/lang/polish.nsh  |4 +++-
 .../Win32/packaging/installer/lang/portuguese.nsh  |4 +++-
 .../packaging/installer/lang/portugueseBR.nsh  |4 +++-
 .../Win32/packaging/installer/lang/romanian.nsh|4 +++-
 .../Win32/packaging/installer/lang/russian.nsh |4 +++-
 .../Win32/packaging/installer/lang/slovak.nsh  |4 +++-
 .../Win32/packaging/installer/lang/spanish.nsh |4 +++-
 .../Win32/packaging/installer/lang/swedish.nsh |4 +++-
 .../Win32/packaging/installer/lang/turkish.nsh |4 +++-
 .../Win32/packaging/installer/lang/ukrainian.nsh   |4 +++-
 25 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/development/Win32/packaging/installer/lang/arabic.nsh 
b/development/Win32/packaging/installer/lang/arabic.nsh
index 19a2bb9..d4c4e3e 100644
--- a/development/Win32/packaging/installer/lang/arabic.nsh
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -110,6 +110,8 @@ ${LangFileString} UnLyXPreferencesTitle 'تفضيلات مستخدم ليك'
 ${LangFileString} SecUnMiKTeXDescription "إزالة توزيعة لتيك MiKTeX."
 #${LangFileString} SecUnJabRefDescription "إزالة مدير ثبت المراجع JabRef."
 ${LangFileString} SecUnPreferencesDescription 'حذف LyX$\'s ضبط$\r$\n\
-   (مجلد 
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+   (مجلد 
$\"$AppPre\username\$\r$\n\
+   $AppSuff\$\r$\n\
+   ${APP_DIR_USERDATA}$\")$\r$\n\
لك او لكل المستخدمين (إذا كنت 
المدير).'
 ${LangFileString} SecUnProgramFilesDescription "إزالة ليك مع كل مكوناته."
diff --git a/development/Win32/packaging/installer/lang/basque.nsh 
b/development/Win32/packaging/installer/lang/basque.nsh
index 32c53b7..db6fe5c 100644
--- a/development/Win32/packaging/installer/lang/basque.nsh
+++ b/development/Win32/packaging/installer/lang/basque.nsh
@@ -112,7 +112,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX-eko 
erabiltzailearen hobespenak'
 ${LangFileString} SecUnMiKTeXDescription "LaTeX-en MiKTeX banaketa 
desinstalatzen du."
 #${LangFileString} SecUnJabRefDescription "Bibliografiaren JabRef kudeatzailea 
desinstalatzen du."
 ${LangFileString} SecUnPreferencesDescription 'LyX-en konfigurazioa ezabatzen 
du$\r$\n\
-   
($\"$AppPre\erabiltzailea\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+   
($\"$AppPre\erabiltzailea\$\r$\n\
+   $AppSuff\$\r$\n\
+   \${APP_DIR_USERDATA}$\"$\r$\n\
zuretzako edo erabiltzaile 
guztientzako (administratzailea bazara).'
 ${LangFileString} SecUnProgramFilesDescription "Desinstalatu LyX eta bere 
osagai guztiak."
 
diff --git a/development/Win32/packaging/installer/lang/catalan.nsh 
b/development/Win32/packaging/installer/lang/catalan.nsh
index 3f2efb4..a7449a5 100644
--- a/development/Win32/packaging/installer/lang/catalan.nsh
+++ b/development/Win32/packaging/installer/lang/catalan.nsh
@@ -105,7 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferències 
d$\'usuari del LyX'
 ${LangFileString} SecUnMiKTeXDescription "Desintal·la la distribució de LaTeX 
MiKTeX."
 #${LangFileString} SecUnJabRefDescription "Desinstal·la el gestor de 
bibliografia JabRef."
 ${LangFileString} SecUnPreferencesDescription 'Suprimeix les carptes de 
configura

[LyX/2.3.x] installer: re-sync with master

[Uwe Stöhr]

commit a96bf1ae89d622d6991b7a2ae0e6645d71df2e56
Author: Uwe Stöhr 
Date:   Fri Mar 22 01:19:48 2019 +0100

installer: re-sync with master

backport all recent fixes from master
---
 .../packaging/installer/DictionaryMirrors.txt  |   24 +
 .../installer/HunspellDictionaryNames.txt  |2 +
 development/Win32/packaging/installer/Packages.txt |2 +-
 development/Win32/packaging/installer/Readme.txt   |6 +-
 .../Win32/packaging/installer/include/LaTeX.nsh|   19 ---
 .../Win32/packaging/installer/include/LyXUtils.nsh |6 --
 .../packaging/installer/include/dictionaries.nsh   |   50 ++-
 .../Win32/packaging/installer/include/init.nsh |   24 +++--
 .../Win32/packaging/installer/lang/arabic.nsh  |4 +-
 .../Win32/packaging/installer/lang/basque.nsh  |4 +-
 .../Win32/packaging/installer/lang/catalan.nsh |4 +-
 .../Win32/packaging/installer/lang/czech.nsh   |4 +-
 .../Win32/packaging/installer/lang/danish.nsh  |4 +-
 .../Win32/packaging/installer/lang/dutch.nsh   |4 +-
 .../Win32/packaging/installer/lang/english.nsh |8 ++-
 .../Win32/packaging/installer/lang/french.nsh  |4 +-
 .../Win32/packaging/installer/lang/galician.nsh|4 +-
 .../Win32/packaging/installer/lang/german.nsh  |4 +-
 .../Win32/packaging/installer/lang/hungarian.nsh   |4 +-
 .../Win32/packaging/installer/lang/indonesian.nsh  |4 +-
 .../Win32/packaging/installer/lang/italian.nsh |4 +-
 .../Win32/packaging/installer/lang/japanese.nsh|4 +-
 .../Win32/packaging/installer/lang/norwegian.nsh   |4 +-
 .../Win32/packaging/installer/lang/polish.nsh  |4 +-
 .../Win32/packaging/installer/lang/portuguese.nsh  |4 +-
 .../packaging/installer/lang/portugueseBR.nsh  |4 +-
 .../Win32/packaging/installer/lang/romanian.nsh|4 +-
 .../Win32/packaging/installer/lang/russian.nsh |4 +-
 .../Win32/packaging/installer/lang/slovak.nsh  |4 +-
 .../Win32/packaging/installer/lang/spanish.nsh |4 +-
 .../Win32/packaging/installer/lang/swedish.nsh |4 +-
 .../Win32/packaging/installer/lang/turkish.nsh |4 +-
 .../Win32/packaging/installer/lang/ukrainian.nsh   |4 +-
 .../Win32/packaging/installer/setup/configure.nsh  |2 +-
 .../Win32/packaging/installer/setup/install.nsh|2 +
 35 files changed, 165 insertions(+), 76 deletions(-)

diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt 
b/development/Win32/packaging/installer/DictionaryMirrors.txt
new file mode 100644
index 000..95ab8e8
--- /dev/null
+++ b/development/Win32/packaging/installer/DictionaryMirrors.txt
@@ -0,0 +1,24 @@
+astuteinternet
+ayera
+cfhcable
+cytranet
+datapacket
+excellmedia
+freefr
+iweb
+jaist
+kent
+liquidtelecom
+managedway
+nchc
+netcologne
+netix
+newcontinuum
+phoenixnap
+pilotfiber
+razaoinfo
+superb-dca2
+svwh
+ufpr
+versaweb
+vorboss
diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt 
b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index 817adc9..625718d 100644
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -82,6 +82,8 @@ is_IS.aff
 is_IS.dic
 it_IT.aff
 it_IT.dic
+ka_GE.aff
+ka_GE.dic
 kk_KZ.aff
 kk_KZ.dic
 ko_KR.aff
diff --git a/development/Win32/packaging/installer/Packages.txt 
b/development/Win32/packaging/installer/Packages.txt
index 3ba3f1e..91020a2 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -100,6 +100,7 @@ lettrine
 listings
 lithuanian
 genmisc
+georgian
 mathtools
 mhchem
 mongolian-babel
@@ -240,7 +241,6 @@ ucs
 extsizes
 frletter
 g-brief
-eurofont
 jsclasses
 platex
 fancyvrb
diff --git a/development/Win32/packaging/installer/Readme.txt 
b/development/Win32/packaging/installer/Readme.txt
index 247fbbf..f288a2d 100644
--- a/development/Win32/packaging/installer/Readme.txt
+++ b/development/Win32/packaging/installer/Readme.txt
@@ -2,12 +2,12 @@
 
 1. extract the source zip-file to e.g. the path "C:\LyX-Installer"
 2. open the file settings.nsh with a text editor
-   and adapt there the following paths to the one on your PC, e.g.:
+   and adapt there the following paths to the ones on your PC, e.g.:
  !define FILES_LYX "C:\LyX-Installer\LyXPackage\LyX"
  !define FILES_DEPS "C:\LyX-Installer\LyX2.2x\lyx-windows-deps-msvc2015"
  !define FILES_QT "C:\LyX-Installer\LyXPackage\LyX"
-3. install the latest version 3.x of NSIS 
(http://nsis.sourceforge.net/Download)
-4. install the NSIS Large Strings build 
(http://nsis.sourceforge.net/Special_Builds)
+3. install the latest version 3.x of NSIS 
(https://nsis.sourceforge.io/Download)
+4. install the NSIS Large Strings build 
(https://nsis.sourceforge.io/Special_Builds)
(extract the extension ZIP file i

[LyX/2.3.x] Win installer: fix bug on init

[Uwe Stöhr]

commit e5c7084a9ca83263f1d2148499a276ea394e6081
Author: Uwe Stöhr 
Date:   Tue Mar 26 02:34:54 2019 +0100

Win installer: fix bug on init

- also remove unused code and some updates
---
 .../Win32/packaging/installer/include/init.nsh |7 +--
 .../packaging/installer/include/variables.nsh  |2 --
 development/Win32/packaging/installer/settings.nsh |6 +++---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/development/Win32/packaging/installer/include/init.nsh 
b/development/Win32/packaging/installer/include/init.nsh
index 59370d4..4276a07 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -610,11 +610,6 @@ Function .onInit
Abort
   ${endif}
   
-  # read the user and computer name
-  ReadRegStr $ComputerName HKLM 
"System\CurrentControlSet\Control\ComputerName\ActiveComputerName" 
"ComputerName"
-  System::Call "advapi32::GetUserName(t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2"
-  StrCpy $UserName $0
-  
   !insertmacro MULTIUSER_INIT
   
   # check if this LyX version is already installed
@@ -632,7 +627,7 @@ Function .onInit
# check if the uninstaller was acidentally deleted
# if so don't bother the user if he realy wants to install a new LyX over 
an existing one
# because he won't have a chance to deny this
-   StrCpy $4 $0 -10 # remove '\bin\lyx,0'
+   StrCpy $4 $0 -12 # remove '\bin\lyx.exe'
# (for FileCheck the variables $0 and $1 cannot be used)
!insertmacro FileCheck $5 "Uninstall-${APP_NAME}.exe" "$4" # macro from 
LyXUtils.nsh
${if} $5 == "False"
diff --git a/development/Win32/packaging/installer/include/variables.nsh 
b/development/Win32/packaging/installer/include/variables.nsh
index bb6982c..57f507c 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -14,7 +14,6 @@ Var APPDATemp
 Var AppPre
 var AppSubfolder
 Var AppSuff
-Var ComputerName
 Var CreateDesktopIcon
 Var CreateFileAssociations
 Var DictCode
@@ -49,6 +48,5 @@ Var ThesCode
 Var ThesCodes
 Var UpdateFNDBReturn
 Var UserList
-Var UserName
 
 Var LangName
diff --git a/development/Win32/packaging/installer/settings.nsh 
b/development/Win32/packaging/installer/settings.nsh
index 9f7d554..56bccaf 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -18,12 +18,12 @@ These typically need to be modified for each LyX release
 
 !define APP_VERSION 
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
 # Version to display
 
-!define COPYRIGHT_YEAR 2018
+!define COPYRIGHT_YEAR 2019
 
 #
 # Installer file name
 
-# Typical names for the release are "LyX-211-Installer-1.exe" etc.
+# Typical names for the release are "LyX-232-Installer-1.exe" etc.
 
 !ifndef ExeFile
   !define ExeFile 
"${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
@@ -46,4 +46,4 @@ These typically need to be modified for each LyX release
 
 !define MiKTeXRepo 
"ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/";
 
-!define ImageMagickVersion "7.0.7"
+!define ImageMagickVersion "7.0.8"

[LyX/master] Win installer: fix bug on init

[Uwe Stöhr]

commit fc98efa7f3e23be35090f324b32976e9e170860f
Author: Uwe Stöhr 
Date:   Tue Mar 26 02:37:19 2019 +0100

Win installer: fix bug on init

- also remove unused code
---
 .../Win32/packaging/installer/include/init.nsh |7 +--
 .../packaging/installer/include/variables.nsh  |2 --
 development/Win32/packaging/installer/settings.nsh |   10 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/development/Win32/packaging/installer/include/init.nsh 
b/development/Win32/packaging/installer/include/init.nsh
index 59370d4..4276a07 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -610,11 +610,6 @@ Function .onInit
Abort
   ${endif}
   
-  # read the user and computer name
-  ReadRegStr $ComputerName HKLM 
"System\CurrentControlSet\Control\ComputerName\ActiveComputerName" 
"ComputerName"
-  System::Call "advapi32::GetUserName(t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2"
-  StrCpy $UserName $0
-  
   !insertmacro MULTIUSER_INIT
   
   # check if this LyX version is already installed
@@ -632,7 +627,7 @@ Function .onInit
# check if the uninstaller was acidentally deleted
# if so don't bother the user if he realy wants to install a new LyX over 
an existing one
# because he won't have a chance to deny this
-   StrCpy $4 $0 -10 # remove '\bin\lyx,0'
+   StrCpy $4 $0 -12 # remove '\bin\lyx.exe'
# (for FileCheck the variables $0 and $1 cannot be used)
!insertmacro FileCheck $5 "Uninstall-${APP_NAME}.exe" "$4" # macro from 
LyXUtils.nsh
${if} $5 == "False"
diff --git a/development/Win32/packaging/installer/include/variables.nsh 
b/development/Win32/packaging/installer/include/variables.nsh
index bb6982c..57f507c 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -14,7 +14,6 @@ Var APPDATemp
 Var AppPre
 var AppSubfolder
 Var AppSuff
-Var ComputerName
 Var CreateDesktopIcon
 Var CreateFileAssociations
 Var DictCode
@@ -49,6 +48,5 @@ Var ThesCode
 Var ThesCodes
 Var UpdateFNDBReturn
 Var UserList
-Var UserName
 
 Var LangName
diff --git a/development/Win32/packaging/installer/settings.nsh 
b/development/Win32/packaging/installer/settings.nsh
index 175b664..56bccaf 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,19 +11,19 @@ These typically need to be modified for each LyX release
 
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 3
-!define APP_VERSION_REVISION 1
+!define APP_VERSION_REVISION 2
 !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_VERSION_BUILD 4 # Start with 1 for the installer releases of each 
version
+!define APP_VERSION_BUILD 1 # 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 2018
+!define COPYRIGHT_YEAR 2019
 
 #
 # Installer file name
 
-# Typical names for the release are "LyX-211-Installer-1.exe" etc.
+# Typical names for the release are "LyX-232-Installer-1.exe" etc.
 
 !ifndef ExeFile
   !define ExeFile 
"${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
@@ -46,4 +46,4 @@ These typically need to be modified for each LyX release
 
 !define MiKTeXRepo 
"ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/";
 
-!define ImageMagickVersion "7.0.7"
+!define ImageMagickVersion "7.0.8"

[LyX features/2.3.3] 2.3.3

[Uwe Stöhr]

The annotated tag, 2.3.3, has been created.
at  2273343b4c83d96ac20094edb6343f9dd3999355 (tag)
   tagging  a96bf1ae89d622d6991b7a2ae0e6645d71df2e56 (commit)
  replaces  2.3.1
 tagged by  Richard Kimberly Heck
on  Tue Jun 18 17:53:33 2019 -0400

- Log -
This is LyX 2.3.3.
-BEGIN PGP SIGNATURE-

iQEcBAABAgAGBQJdCV1lAAoJEN56RPrH+zgtbsEH/3wZCVkm/HvsfTb1qVHyjXyJ
LDZ3xUCGv5y+gyqPOJcZZvxLM5GUqTjeA+8JTdIsKE4P9taVhn19ktG3wg+wvw+N
czdC5CQde/xzjlBFgYcUYDnBzZ2P1bkrYI9Q64ADD/LRJbDNuri+kVdfHtIY0xT6
W66LfIM+KIE2cYbxROiHeGDXjSYiRdWg1umUVEMR3xw1OpDyZ86zKqlXVBXo7Ueg
egrXAIZqAAu+Q+uTCSEXERGMfPVM/NEkEBfQJTHIRGdgXNkVVAWQDOD1nf25IFsk
rNT1Pa5yePMZJ0kms0HVaZjPDJZge03AAaceB7/kyOJTooE6fqHlm5VD/xuMP/0=
=gmip
-END PGP SIGNATURE-

Daniel Ramoeller (1):
  Fix for #11294: Wrong description for Change bars module

Enrico Forestieri (25):
  Fix bug #11203
  Update it.po
  Fix bug #11210
  Update it.po
  Fix bug #11180
  Fix bug #9348
  Fix bug #11332
  Update it.po
  Fix bug #11367
  Fix bug #11398
  Amend bd21aa9
  Fix reloading of local layout file (bug #11120)
  Fix display of single-char macro names
  Fix bug #9622
  Fix bug 11346
  Update it.po
  Amend [324b8287/lyxgit]
  Update it.po
  Replace environment variables in PATH prefix
  Remove PYTHONPATH from the environment on Windows
  Update it.po
  Fix bug #11484
  Fix bug #4269
  Fix bug #4269 and avoid crash with gzipped file
  Fix bug #11490

Guillaume MM (1):
  Fix segfault after deleting monitor

Guillaume Munch (1):
  Make tab movement visible (#10733)

Jean-Marc Lasgouttes (42):
  Fixes to input method handling
  Draw top/bottom rules heavier for booktab
  Fix disappearing blue language underline.
  Use a unicode character for menu separator on screen
  needauth is not needed for Sweave>LyX
  Do not remove character at start of paragraph when cutting
  Improve DEPM
  Forgot this
  Handle branches with space in their name
  Paint underline for insets too.
  Avoid space before completion in mathed
  Ignore horizontal wheel scrolling in workarea
  Avoid crash with cursor down in math
  When ignoring an update, request one for later
  Amend 4ecbff00: it is too early for skipping the updateMacros call
  Avoid extra space in tooltips
  Show cursor correctly when loading file
  Remove old workaround that is not needed anymore
  Fix selection of unmarked RtL text
  Set buffer correctly when changing math space type.
  Make sure inset buffer is correctly set in math grid
  Update boost to 1.68.
  Fix undo after breaking a nested paragraph
  Fix embarrassing typo
  Make DEPM respect current cursor position.
  Add override statements to please clang
  Remove premature (and bad) optimization
  Fix vertical offset of fonts like MinionPro
  Avoid crash when using inset-select-all in tabular
  Fix drawing of labels in insets
  forgot this
  Allow toggling (no)limits only after mathop symbol
  Fix display of gather in lefteqn mode
  Allow to type a space in front of another one
  Fix algorithm for finding localized files
  Fix Visual C++ warning
  Fix DEPM at end of paragraph
  Fix position of cursor when DEPM is used in change tracking mode
  Improve DEPM when change tracking is on
  Update screen as needed when preferences are changed
  Place the depth bar correctly in full screen mode
  Cache the value of GuiFontMetrics::lbearing().

Juergen Spitzmueller (112):
  Redesign character dialog
  Improve Springer layout descriptions
  Do not start from a non-relevant parent in Buffer cloning.
  Disambiguate dialog buttons
  Capitalization fixes
  Use footnotehyper rather than footnote if hyperref is used
  Support input of non-ASCII characters in hyperlinks
  Consider EuropeanNumberTerminator property when determining text direction
  tex2lyx: extend titling support
  Wrap rotated cells with linebreaks in varwidth
  Disallow paragraph customization in some single-par charstyle insets
  Implement tri-state in GuiSetBorder
  Proper logos with RTL
  Par alignment in floats must be swapped for all RTL langs, not only Hebrew
  Consider required modules when checking for layout definitions in modules
  We do not natively support multirow yet
  tex2lyx: Add support for multirow
  de.po
  tex2lyx: Fix import of Arabic polyglossia environment
  tex2lyx: fix import of unknown commands'/environments' options
  Allow to change multiple columns' width at once
  Covington now provides subexamples itself
  Fix text direction issue for InsetInfo in RTL context
  Amend 79cf3f5ec10
  Support key symbols via menukeys package
  Fix shortcuts in

[LyX/master] Fancy_Colored_Boxes.lyx: add section about references

[Uwe Stöhr]

commit ebf42d9b104e0d6aff5b562a0823b1dab7f900a6
Author: Uwe Stöhr 
Date:   Sun Jul 21 01:27:43 2019 +0200

Fancy_Colored_Boxes.lyx: add section about references

is a user request
---
 lib/examples/Modules/Fancy_Colored_Boxes.lyx |  112 ++
 1 files changed, 112 insertions(+), 0 deletions(-)

diff --git a/lib/examples/Modules/Fancy_Colored_Boxes.lyx 
b/lib/examples/Modules/Fancy_Colored_Boxes.lyx
index bbf4415..3d442d6 100644
--- a/lib/examples/Modules/Fancy_Colored_Boxes.lyx
+++ b/lib/examples/Modules/Fancy_Colored_Boxes.lyx
@@ -128,6 +128,15 @@ Uwe Stöhr
 \end_layout
 
 \begin_layout Standard
+\begin_inset CommandInset toc
+LatexCommand tableofcontents
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 With the module 
 \emph on
 Fancy
@@ -1787,6 +1796,102 @@ beamer
 \end_layout
 
 \begin_layout Subsection
+References
+\end_layout
+
+\begin_layout Standard
+You cannot use \SpecialChar LyX
+'s label/reference mechanisms for fancy colored boxes.
+ Numbered boxes can be referenced by adding
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+, label={name}
+\end_layout
+
+\begin_layout Standard
+to the the 
+\family sans
+Color Box Options
+\family default
+ inset, whereby 
+\series bold
+name
+\series default
+ is the label name used to reference the box.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Flex Custom Color Box 2
+status open
+
+\begin_layout Plain Layout
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+Mass–energy equivalence, label={Einstein}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Formula 
+\[
+E=mc^{2}.
+\]
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+To reference the box, insert the command
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+ref{name}
+\end_layout
+
+\begin_layout Standard
+as \SpecialChar TeX
+ code to the text where the reference should appear.
+\end_layout
+
+\begin_layout Standard
+This is the reference to Example
+\begin_inset space \space{}
+\end_inset
+
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+ref{Einstein}
+\end_layout
+
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Subsection
 Skins
 \end_layout
 
@@ -1821,6 +1926,13 @@ literal "true"
  Only the most important skins are listed in the following.
 \end_layout
 
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
 \begin_layout Subsubsection
 Enhanced
 \begin_inset CommandInset label

[LyX/2.3.x] colored-boxes.lyx: add section about references

[Uwe Stöhr]

commit 0baa24df71b72ec804a13fc836c4874ed6472e99
Author: Uwe Stöhr 
Date:   Sun Jul 21 01:31:46 2019 +0200

colored-boxes.lyx: add section about references

is a user request
---
 lib/examples/colored-boxes.lyx |  112 
 status.23x |2 +
 2 files changed, 114 insertions(+), 0 deletions(-)

diff --git a/lib/examples/colored-boxes.lyx b/lib/examples/colored-boxes.lyx
index 2ed3665..114517e 100644
--- a/lib/examples/colored-boxes.lyx
+++ b/lib/examples/colored-boxes.lyx
@@ -128,6 +128,15 @@ Uwe Stöhr
 \end_layout
 
 \begin_layout Standard
+\begin_inset CommandInset toc
+LatexCommand tableofcontents
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 With the module 
 \emph on
 Fancy
@@ -1787,6 +1796,102 @@ beamer
 \end_layout
 
 \begin_layout Subsection
+References
+\end_layout
+
+\begin_layout Standard
+You cannot use \SpecialChar LyX
+'s label/reference mechanisms for fancy colored boxes.
+ Numbered boxes can be referenced by adding
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+, label={name}
+\end_layout
+
+\begin_layout Standard
+to the the 
+\family sans
+Color Box Options
+\family default
+ inset, whereby 
+\series bold
+name
+\series default
+ is the label name used to reference the box.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Flex Custom Color Box 2
+status open
+
+\begin_layout Plain Layout
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+Mass–energy equivalence, label={Einstein}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Formula 
+\[
+E=mc^{2}.
+\]
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+To reference the box, insert the command
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+ref{name}
+\end_layout
+
+\begin_layout Standard
+as \SpecialChar TeX
+ code to the text where the reference should appear.
+\end_layout
+
+\begin_layout Standard
+This is the reference to Example
+\begin_inset space \space{}
+\end_inset
+
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+ref{Einstein}
+\end_layout
+
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Subsection
 Skins
 \end_layout
 
@@ -1821,6 +1926,13 @@ literal "true"
  Only the most important skins are listed in the following.
 \end_layout
 
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
 \begin_layout Subsubsection
 Enhanced
 \begin_inset CommandInset label
diff --git a/status.23x b/status.23x
index ede30ab..9e9cce9 100644
--- a/status.23x
+++ b/status.23x
@@ -35,6 +35,8 @@ What's new
 
 * DOCUMENTATION AND LOCALIZATION
 
+- New section about references in the example file colored-boxes.lyx.
+
 - The Dutch user interface localization has been revived, and the Dutch docs
   revised.
 

[LyX/2.3.x] development/Makefile.am: fix compilation error

[Uwe Stöhr]

commit cbaf5e70f878287874e7abf5127a8824ce50c659
Author: Uwe Stöhr 
Date:   Sun Oct 20 21:20:55 2019 +0200

development/Makefile.am: fix compilation error

see also my message on the list
---
 development/Makefile.am |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/development/Makefile.am b/development/Makefile.am
index f5b218d..5f2cb83 100644
--- a/development/Makefile.am
+++ b/development/Makefile.am
@@ -128,6 +128,7 @@ checkurls/CheckURL.pm \
 checkurls/search_url.pl \
 cmake/ConfigureChecks.cmake \
 cmake/Install.cmake \
+cmake/lyx.ico \
 cmake/LyxPackaging.cmake \
 cmake/LyX_description.txt \
 cmake/LyX_license.txt \
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] INSTALL.Win32: complete overhaul

[Uwe Stöhr]

commit a4dde678eb1dca7bc5f2f2bebe477a24567713fd
Author: Uwe Stöhr 
Date:   Sun Oct 20 23:08:07 2019 +0200

INSTALL.Win32: complete overhaul

- based on MSVC 2017
---
 INSTALL.Win32 |  112 +++-
 1 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index f26925f..893470d 100644
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -1,7 +1,7 @@
-Compiling LyX 2.3 for Win32 and creating Windows installer
+Compiling LyX 2.4 for Win32 and creating Windows installer
 ==
 
-It's recommended to compile LyX using Microsoft Visual C++ 2015 and CMake.
+It's recommended to compile LyX using Microsoft Visual C++ 2017 and CMake.
 
 
 Compiling with Microsoft Visual C++ (MSVC)
@@ -15,38 +15,28 @@ Compiling with Microsoft Visual C++ (MSVC)

 

-   The following instructions assume the LyX source code is in 
C:\LyX\lyx-23
+   The following instructions assume the LyX source code is in 
C:\LyX\lyx-24
You can also use another directory if you prefer.
 
-1  Install MSVC 2015
-
-   If you don't have Visual C++ 2015 installed, get the free Community 
edition
-   from https://www.visualstudio.com/. Make sure that the following two
-   features are selected for installation:
-   - "Visual C++" from "Programming languages" (only the first option
- "Common Tools for Visual C++ 2015" is needed)
-   - "Tools and Windows SDKs" from "Windows 8.1 and Windows Phone 8.0/8.1 
Tools"
-   The latter one requires Windows 8.1. If you use an older windows version
-   please install the "Windows Software Development Kit (SDK) für Windows 
8.1"
-   from 
https://developer.microsoft.com/en-us/windows/downloads/windows-8-1-sdk.
-   This version requires at least Windows 7.
-   If the build complains later that it cannot find the file
-   C:\Microsoft.Cpp.Default.props then the SDK is not installed properly.
+1  Install MSVC 2017
+
+   If you don't have Visual C++ 2017 installed, get the free Community 
edition
+   from 
https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=15
 
 2  Install Qt
 
-   Download the latest Qt for Open Source C++ development on Windows 
(VS2015)
+   Download the latest Qt for Open Source C++ development on Windows 
(VS2017)
from https://qt.io/download-open-source/
-   Qt 5.6.x is recommended, but 5.7.x or later versions should work as 
well.
+   Qt 5.12.x is recommended, but 5.9.x or later versions should work as 
well.
If you want to build LyX as 32bit application, you need Qt x86.
If you want to build LyX as 64bit application, you need Qt x64.
Make sure that the bin subfolder of the Qt installation (e.g.
-   C:\Qt\Qt5.6.1\5.6\msvc2015\bin) is listed in the PATH environment 
variable.
 
 3  Install Python
 
-   Install the latest Python 2.x or 3.x version from
+   Install the latest Python 3.x version from
https://www.python.org/downloads/
+   Assure that you use the installer option "Add Python 3.x to PATH"
 
 4  Install CMake
 
@@ -55,32 +45,30 @@ Compiling with Microsoft Visual C++ (MSVC)
 5  Download dependencies
 
Download the LyX for Windows build dependencies from
-   ftp.lyx.de/LyXWinInstaller/lyx-windows-deps-msvc2015.zip
+   ftp.lyx.de/LyXWinInstaller/lyx-windows-deps-msvc2017.zip
+   and extract it e.g. to 
+   C:\LyX\lyx-24\lyx-windows-deps-msvc2017
 
 6  Configure
 
-   - Open the "Developer Command Prompt for VS2015" from the
- "Visual Studio 2015\Visual Studio Tools" subfolder of the start menu.
- Run the CMake GUI from the command window that was opened.
- Alternatively, you can create a .bat file that first contains the line
- call "C:\Program Files (x86)\Microsoft Visual Studio 
14.0\VC\vcvarsall.bat" x86
- and then calls the CMake GUI and use this .bat file to start CMake.
- This is for building a 32bit LyX, if you want to build a 64bit LyX 
replace
- 'x86' by 'amd64'.
- The MSVC 2015 command prompt or vcvarsall.bat set some environment
- variables that are needed for CMake to find the compiler.
-
-   - Set the source code path to C:\LyX\lyx-23
- Set the build path to C:\LyX\lyx-23-build
- Click Configure and set the generator to "Visual Studio 14 2015" to
- build a 32bit LyX or "Visual Studio 14 2015 Win64" to build a 64bit 
LyX.
+   - Open the CMake GUI
+   
+   - Set the source code path to C:\LyX\lyx-24
+ Set the build path to C:\L

[LyX/master] INSTALL.Win32: add missing info

[Uwe Stöhr]

commit 866c1bef3eec4dcfe57ec09105ac1bcfbc179eef
Author: Uwe Stöhr 
Date:   Sun Oct 20 23:24:01 2019 +0200

INSTALL.Win32: add missing info
---
 INSTALL.Win32 |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index 893470d..66c8551 100644
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -111,6 +111,7 @@ Compiling with Microsoft Visual C++ (MSVC)
iconengines
imageformats
platforms
+   styles
to C:\LyX\lyx-24-build\LYX_INSTALLED\bin
 
 9  Start LyX
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] build5-2017.bat: add new script to compile using MSVC 2017

[Uwe Stöhr]

commit d995ea684f1080b7e448ba73883a33417460f134
Author: Uwe Stöhr 
Date:   Sun Oct 20 23:11:17 2019 +0200

build5-2017.bat: add new script to compile using MSVC 2017
---
 development/cmake/build5-2017-installer.bat |   41 +++
 development/cmake/build5-2017.bat   |  101 +++
 2 files changed, 142 insertions(+), 0 deletions(-)

diff --git a/development/cmake/build5-2017-installer.bat 
b/development/cmake/build5-2017-installer.bat
new file mode 100644
index 000..fa2d4a0
--- /dev/null
+++ b/development/cmake/build5-2017-installer.bat
@@ -0,0 +1,41 @@
+REM Run this script via double click.
+
+REM Create a link and add  cmd.exe /k  in the preferences in front of the 
mingw.bat call to prevent closing the cmd window.
+
+::echo off
+
+REM Install Qt from qt.io
+set PATH=C:\Qt\Qt5.12.5\5.12.5\msvc2017\bin;%PATH%
+
+set LYX_SOURCE=%~DP0..\..
+set LYX_BUILD=%LYX_SOURCE%\..\build-result-5-2017
+
+echo LyX source: %LYX_SOURCE%
+echo LyX build : %LYX_BUILD%
+
+
+REM first remove an existing compilation to assure a clean version
+mkdir %LYX_BUILD%
+del /s/q %LYX_BUILD%\*
+rmdir /s/q %LYX_BUILD%\LYX_INSTALLED
+
+REM Download 
http://sourceforge.net/projects/lyx/files/Win_installers/Dependencies/lyx20-deps-msvc2010-x86.zip
+REM Extract on the same level as LyX sources
+set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2017
+
+REM MSVC 2017 tools
+call "C:\Program Files (x86)\Microsoft Visual 
Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
+
+cd %LYX_BUILD%
+cmake %LYX_SOURCE% -G"NMake Makefiles" -DLYX_USE_QT=QT5 -DLYX_MERGE_FILES=1 
-DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF 
+
+nmake doc
+nmake translations
+nmake
+nmake install
+
+goto :eof
+:eof
+
+REM go back to the dir where the script was called from
+cd /D %CALLED_FROM%
diff --git a/development/cmake/build5-2017.bat 
b/development/cmake/build5-2017.bat
new file mode 100644
index 000..6fe84aa
--- /dev/null
+++ b/development/cmake/build5-2017.bat
@@ -0,0 +1,101 @@
+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 Edit pathes here or set the environment variables on your system.
+set CMAKE_PATH="C:\Program Files\CMake\bin"
+set QT_PATH="C:\Qt\Qt5.12.5\5.12.5\msvc2017"
+set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2017"
+set LYX_SOURCE="D:\LyXGit\Master"
+set LYX_BUILD="D:\LyXGit\Master\compile-2017"
+
+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%
+echo GNUWIN32_DIR : %GNUWIN32_DIR%
+
+if [%QT_PATH%]==[] (
+   echo QT_PATH not set.
+) else set PATH=%QT_PATH%;%PATH%
+echo QT_PATH : %QT_PATH%
+
+if [%CMAKE_PATH%]==[] (
+   echo CMAKE_PATH not set.
+) else set PATH=%CMAKE_PATH%;%PATH%
+echo CMAKE_PATH : %CMAKE_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 %LYX_BUILD%\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 15 2017" 
-DCMAKE_PREFIX_PATH=%QT_PATH% -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0 
-DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 
-DLYX_CONSOLE=ON -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD%
+   msbuild src\LyX.vcxproj /p:Configuration=Debug
+   msbuild sr

[LyX/2.3.x] Win installer: fix registry issue

[Uwe Stöhr]

commit 54acc050f6f90a4c290dc2ef9334c9872764089a
Author: Uwe Stöhr 
Date:   Sun Oct 20 23:06:21 2019 +0200

Win installer: fix registry issue

- when installing LyX 2.3.x over a previous 2.3.x installation a registry 
key was not deleted
- also fix some hardcoded occurrences of "lyx"
---
 .../packaging/installer/include/declarations.nsh   |7 ---
 .../Win32/packaging/installer/setup/configure.nsh  |4 +++-
 .../Win32/packaging/installer/setup/install.nsh|2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/development/Win32/packaging/installer/include/declarations.nsh 
b/development/Win32/packaging/installer/include/declarations.nsh
index 2e96869..34e6b7e 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -37,6 +37,7 @@ Configuration of LyX installer
 # Names and version
 
 !define APP_NAME "LyX"
+!define APP_NAME_SMALL "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.2" 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)
@@ -66,8 +67,8 @@ Configuration of LyX installer
 
 !define APP_REGNAME_DOC "${APP_NAME}.Document"
 
-!define APP_EXT ".lyx"
-!define APP_MIME_TYPE "application/lyx"
+!define APP_EXT ".${APP_NAME_SMALL}"
+!define APP_MIME_TYPE "application/${APP_NAME_SMALL}"
 
 !define APP_UNINST_KEY 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}"
 
@@ -81,7 +82,7 @@ Configuration of LyX installer
   !define SETUP_EXE ${ExeFile}
 !endif
 
-!define SETUP_ICON "${FILES_ICONS}\lyx.ico"
+!define SETUP_ICON "${FILES_ICONS}\${APP_NAME_SMALL}.ico"
 !define SETUP_HEADERIMAGE "graphics\header.bmp"
 !define SETUP_WIZARDIMAGE "graphics\wizard.bmp"
 !define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe"
diff --git a/development/Win32/packaging/installer/setup/configure.nsh 
b/development/Win32/packaging/installer/setup/configure.nsh
index 31a92e2..31a1825 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -46,7 +46,7 @@ Section -InstallData
   
   WriteRegStr SHCTX ${APP_UNINST_KEY} "UninstallString" 
'"$INSTDIR\${SETUP_UNINSTALLER}"'
   WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}"
-  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\lyx.exe"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" 
"$INSTDIR\bin\${APP_NAME_SMALL}.exe"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "${APP_WEBPAGE}"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout" 
"https://www.lyx.org/AboutLyX";
   WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "${APP_NAME} Team"
@@ -58,8 +58,10 @@ Section -InstallData
   # if we install over an older existing version, remove the old uninstaller 
information
   ${if} $OldVersionNumber < ${APP_SERIES_KEY}
DeleteRegKey SHCTX 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber"
+   DeleteRegKey SHCTX "SOFTWARE\${APP_NAME}$OldVersionNumber"
# also delete in the case of an emergency release
DeleteRegKey SHCTX 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber1"
+   DeleteRegKey SHCTX "SOFTWARE\${APP_NAME}$OldVersionNumber1"
   ${endif}
   
 SectionEnd
diff --git a/development/Win32/packaging/installer/setup/install.nsh 
b/development/Win32/packaging/installer/setup/install.nsh
index 53196e3..8aeef94 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -18,7 +18,7 @@ Section -ProgramFiles SecProgramFiles
   # be installed directly to C:\programs - the uninstaller will then delete 
the whole
   # C:\programs directory
   StrCpy $String $INSTDIR
-  StrCpy $Search "LyX"
+  StrCpy $Search "${APP_NAME}"
   Call StrPoint # function from LyXUtils.nsh
   ${if} $Pointer == "-1"
StrCpy $INSTDIR "$INSTDIR\${APP_DIR}"
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] ar.po: fix wrong translations

[Uwe Stöhr]

commit d55865b19a9506f9aa7187d0b46d3f9d520f1cfb
Author: Uwe Stöhr 
Date:   Sun Oct 20 21:41:56 2019 +0200

ar.po: fix wrong translations

- found by the compiler
- 2.3.x branch is not affected
---
 po/ar.gmo |  Bin 384721 -> 447069 bytes
 po/ar.po  |   10 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/ar.gmo b/po/ar.gmo
index 8d76041..0d58425 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 600f2d8..fa546a3 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7033,7 +7033,7 @@ msgstr "ملحق القسم الفرعي"
 
 #: lib/layouts/aastex62.layout:249
 msgid "\\Alph{appendix}\\arabic{subappendix}."
-msgstr "\\Alph{appendix}\arabic{subappendix}."
+msgstr "\\Alph{appendix}\\arabic{subappendix}."
 
 #: lib/layouts/aastex62.layout:260 lib/layouts/copernicus.layout:269
 msgid "Subsubsection Appendix"
@@ -7041,7 +7041,7 @@ msgstr "ملحق قسم تحت فرعي"
 
 #: lib/layouts/aastex62.layout:264
 msgid "\\Alph{appendix}\\arabic{subappendix}.\\arabic{subsubappendix}."
-msgstr "\\Alph{appendix}\arabic{subappendix}.\arabic{subsubappendix}."
+msgstr "\\Alph{appendix}\\arabic{subappendix}.\\arabic{subsubappendix}."
 
 #: lib/layouts/achemso.layout:3 lib/examples/Articles:0
 msgid "American Chemical Society (ACS)"
@@ -9794,7 +9794,7 @@ msgstr "\\Alph{appendix}\arabic{subappendix}"
 
 #: lib/layouts/copernicus.layout:273
 msgid "\\Alph{appendix}\\arabic{subappendix}.\\arabic{subsubappendix}"
-msgstr "\\Alph{appendix}\arabic{subappendix}.\arabic{subsubappendix}"
+msgstr "\\Alph{appendix}\\arabic{subappendix}.\\arabic{subsubappendix}"
 
 #: lib/layouts/copernicus.layout:296
 msgid "CodeAvailability"
@@ -10558,7 +10558,7 @@ msgstr "معيار \\arabic{theorem}"
 
 #: lib/layouts/elsart.layout:361
 msgid "Algorithm \\arabic{theorem}"
-msgstr "لوغرتم \arabic{theorem}"
+msgstr "لوغرتم \\arabic{theorem}"
 
 #: lib/layouts/elsart.layout:368
 msgid "Definition \\arabic{theorem}"
@@ -10570,7 +10570,7 @@ msgstr "حدس \\arabic{theorem}"
 
 #: lib/layouts/elsart.layout:389
 msgid "Example \\arabic{theorem}"
-msgstr "مثال \arabic{theorem}"
+msgstr "مثال \\arabic{theorem}"
 
 #: lib/layouts/elsart.layout:396
 msgid "Problem \\arabic{theorem}"
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Win installer: fix registry issue

[Uwe Stöhr]

commit 273d257f2a07dc1ef7942889649f47a97373f2a1
Author: Uwe Stöhr 
Date:   Sun Oct 20 23:26:08 2019 +0200

Win installer: fix registry issue

- when installing LyX 2.x.z over a previous 2.x.y installation a registry 
key was not deleted
- also fix some hardcoded occurrences of "lyx"
---
 .../packaging/installer/include/declarations.nsh   |9 +
 .../Win32/packaging/installer/setup/configure.nsh  |4 +++-
 .../Win32/packaging/installer/setup/install.nsh|2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/development/Win32/packaging/installer/include/declarations.nsh 
b/development/Win32/packaging/installer/include/declarations.nsh
index 2e96869..84ebabd 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -37,6 +37,7 @@ Configuration of LyX installer
 # Names and version
 
 !define APP_NAME "LyX"
+!define APP_NAME_SMALL "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.2" 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)
@@ -57,7 +58,7 @@ Configuration of LyX installer
   !define APP_SETUPTYPE "Standard"
 !endif
 
-!define BIN_LYX "LyX.exe"
+!define BIN_LYX "${APP_NAME}.exe"
 !define APP_RUN "bin\${BIN_LYX}"
 
 !define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX220"
@@ -66,8 +67,8 @@ Configuration of LyX installer
 
 !define APP_REGNAME_DOC "${APP_NAME}.Document"
 
-!define APP_EXT ".lyx"
-!define APP_MIME_TYPE "application/lyx"
+!define APP_EXT ".${APP_NAME_SMALL}"
+!define APP_MIME_TYPE "application/${APP_NAME_SMALL}"
 
 !define APP_UNINST_KEY 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}"
 
@@ -81,7 +82,7 @@ Configuration of LyX installer
   !define SETUP_EXE ${ExeFile}
 !endif
 
-!define SETUP_ICON "${FILES_ICONS}\lyx.ico"
+!define SETUP_ICON "${FILES_ICONS}\${APP_NAME_SMALL}.ico"
 !define SETUP_HEADERIMAGE "graphics\header.bmp"
 !define SETUP_WIZARDIMAGE "graphics\wizard.bmp"
 !define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe"
diff --git a/development/Win32/packaging/installer/setup/configure.nsh 
b/development/Win32/packaging/installer/setup/configure.nsh
index 97bc945..5daf6d6 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -46,7 +46,7 @@ Section -InstallData
   
   WriteRegStr SHCTX ${APP_UNINST_KEY} "UninstallString" 
'"$INSTDIR\${SETUP_UNINSTALLER}"'
   WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}"
-  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\lyx.exe"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" 
"$INSTDIR\bin\${APP_NAME_SMALL}.exe"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "${APP_WEBPAGE}"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout" 
"https://www.lyx.org/AboutLyX";
   WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "${APP_NAME} Team"
@@ -58,8 +58,10 @@ Section -InstallData
   # if we install over an older existing version, remove the old uninstaller 
information
   ${if} $OldVersionNumber < ${APP_SERIES_KEY}
DeleteRegKey SHCTX 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber"
+   DeleteRegKey SHCTX "SOFTWARE\${APP_NAME}$OldVersionNumber"
# also delete in the case of an emergency release
DeleteRegKey SHCTX 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber1"
+   DeleteRegKey SHCTX "SOFTWARE\${APP_NAME}$OldVersionNumber1"
   ${endif}
   
 SectionEnd
diff --git a/development/Win32/packaging/installer/setup/install.nsh 
b/development/Win32/packaging/installer/setup/install.nsh
index 53196e3..8aeef94 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -18,7 +18,7 @@ Section -ProgramFiles SecProgramFiles
   # be installed directly to C:\programs - the uninstaller will then delete 
the whole
   # C:\programs directory
   StrCpy $String $INSTDIR
-  StrCpy $Search "LyX"
+  StrCpy $Search "${APP_NAME}"
   Call StrPoint # function from LyXUtils.nsh
   ${if} $Pointer == "-1"
StrCpy $INSTDIR "$INSTDIR\${APP_DIR}"
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] gnuplot.lyx: add missing makefile entries

[Uwe Stöhr]

commit 2f44afcb75153d104586b78573978126d9742ea7
Author: Uwe Stöhr 
Date:   Mon May 8 23:29:25 2017 +0200

gnuplot.lyx: add missing makefile entries

- also adapt style to match existing examples (e.g. the filename)
---
 lib/Makefile.am  |2 +
 lib/examples/example_gnuplot.gp  |4 -
 lib/examples/example_gnuplot.lyx |  213 --
 lib/examples/gnuplot-example.gp  |4 +
 lib/examples/gnuplot.lyx |  208 +
 5 files changed, 214 insertions(+), 217 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e4354ff..b655357 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -327,6 +327,8 @@ dist_examples_DATA = \
examples/example_lyxified.lyx \
examples/example_raw.lyx \
examples/FeynmanDiagrams.lyx \
+   examples/gnuplot.lyx \
+   examples/gnuplot-example.gp \
examples/H-P-statements.lyx \
examples/iecc05.fen \
examples/iecc07.fen \
diff --git a/lib/examples/example_gnuplot.gp b/lib/examples/example_gnuplot.gp
deleted file mode 100644
index 910ea26..000
--- a/lib/examples/example_gnuplot.gp
+++ /dev/null
@@ -1,4 +0,0 @@
-set grid
-set xlabel "Sample"
-set ylabel "My Value"
-plot exp(-x) t 'Titles'
diff --git a/lib/examples/example_gnuplot.lyx b/lib/examples/example_gnuplot.lyx
deleted file mode 100644
index 759e77e..000
--- a/lib/examples/example_gnuplot.lyx
+++ /dev/null
@@ -1,213 +0,0 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 542
-\begin_document
-\begin_header
-\save_transient_properties true
-\origin /systemlyxdir/examples/
-\textclass article
-\use_default_options true
-\maintain_unincluded_children false
-\language english
-\language_package default
-\inputencoding auto
-\fontencoding global
-\font_roman "default" "default"
-\font_sans "default" "default"
-\font_typewriter "default" "default"
-\font_math "auto" "auto"
-\font_default_family default
-\use_non_tex_fonts false
-\font_sc false
-\font_osf false
-\font_sf_scale 100 100
-\font_tt_scale 100 100
-\use_microtype false
-\use_dash_ligatures true
-\graphics default
-\default_output_format default
-\output_sync 0
-\bibtex_command default
-\index_command default
-\paperfontsize default
-\use_hyperref false
-\papersize default
-\use_geometry false
-\use_package amsmath 1
-\use_package amssymb 1
-\use_package cancel 1
-\use_package esint 1
-\use_package mathdots 1
-\use_package mathtools 1
-\use_package mhchem 1
-\use_package stackrel 1
-\use_package stmaryrd 1
-\use_package undertilde 1
-\cite_engine basic
-\cite_engine_type default
-\biblio_style plain
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date false
-\justification true
-\use_refstyle 1
-\index Index
-\shortcut idx
-\color #008000
-\end_index
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation indent
-\paragraph_indentation default
-\is_math_indent 0
-\math_number_before 0
-\quotes_style english
-\dynamic_quotes 0
-\papercolumns 1
-\papersides 1
-\paperpagestyle default
-\tracking_changes false
-\output_changes false
-\html_math_output 0
-\html_css_as_file 0
-\html_be_strict false
-\end_header
-
-\begin_body
-
-\begin_layout Title
-LyX Gnuplot scripting example
-\end_layout
-
-\begin_layout Standard
-This is a sample LyX file showing a Graphics inset including a simple gnuplot
- script, that is auto-converted when previewing on-screen and when formatting
- for PDF or other output format.
-\end_layout
-
-\begin_layout Standard
-This can be inserted using the menu 
-\family sans
-Insert\SpecialChar menuseparator
-Graphics...
-
-\family default
- then choosing a GNUPLOT script with either 
-\family typewriter
-.gp
-\family default
- or 
-\family typewriter
-.gnuplot
-\family default
- extension.
- You should see a plot just below this text.
-\end_layout
-
-\begin_layout Standard
-\begin_inset Graphics
-   filename example_gnuplot.gp
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-If you don't see it, there are basically a few possible causes
-\end_layout
-
-\begin_layout Enumerate
-you don't have Gnuplot installed
-\end_layout
-
-\begin_layout Enumerate
-you have on-screen graphics display disabled; this can be checked/enabled
- with menu 
-\family sans
-Tools\SpecialChar menuseparator
-Preferences...,
-\family default
- pane 
-\family sans
-Look & feel\SpecialChar menuseparator
-Display,
-\family default
- then ensuring that the option 
-\family typewriter
-Display graphics
-\family default
- is enabled
-\end_layout
-
-\begin_layout Enumerate
-you have 
-\family typewriter
-needauth
-\family default
- converters completely disabled/forbidden (Gnuplot is among this type of
- converters, more information is available at 
-\begin_inset Flex URL
-status open
-
-\begin_layout Plain Layout
-
-http://www.lyx.or

[LyX/master] Color.cpp: fix bug #10656

[Uwe Stöhr]

commit 74f56e261a991e8ed0c2910213c7713715b63027
Author: Uwe Stöhr 
Date:   Tue May 9 00:09:10 2017 +0200

Color.cpp: fix bug #10656
---
 src/Color.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/Color.cpp b/src/Color.cpp
index 5eda834..b405dc4 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -298,7 +298,7 @@ ColorSet::ColorSet()
{ Color_paragraphmarker, N_("paragraph marker"), "paragraphmarker", 
grey80, "paragraphmarker"},
{ Color_previewframe, N_("preview frame"), "previewframe", "black", 
"previewframe"},
{ Color_inherit, N_("inherit"), "inherit", "black", "inherit" },
-   { Color_regexpframe, N_("regexp frame"), "green", "green", "green" },
+   { Color_regexpframe, N_("regexp frame"), "regexpframe", "green", 
"regexpframe" },
{ Color_ignore, N_("ignore"), "ignore", "black", "ignore" },
{ Color_ignore, 0, 0, 0, 0 }
};

[LyX/master] GuiDocument: fix bug #10653

[Uwe Stöhr]

commit 902b5f368b959eb88e3744f701cf8dfe664bde52
Author: Uwe Stöhr 
Date:   Tue May 9 01:00:36 2017 +0200

GuiDocument: fix bug #10653

- also rename a function because we have the same function name in 
BufferParams
---
 src/frontends/qt4/GuiDocument.cpp |   17 ++---
 src/frontends/qt4/GuiDocument.h   |2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index 744229f..e58554b 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1268,7 +1268,7 @@ GuiDocument::GuiDocument(GuiView & lv)
connect(mathsModule->MathIndentCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(mathsModule->MathIndentCO, SIGNAL(activated(int)),
-   this, SLOT(setMathIndent(int)));
+   this, SLOT(EnableMathIndent(int)));
connect(mathsModule->MathIndentLE, SIGNAL(textChanged(const QString &)),
this, SLOT(change_adaptor()));
connect(mathsModule->MathIndentLengthCO, SIGNAL(activated(int)),
@@ -1630,7 +1630,7 @@ void GuiDocument::allowMathIndent() {
isValid();
 }
 
-void GuiDocument::setMathIndent(int item)
+void GuiDocument::EnableMathIndent(int item)
 {
bool const enable = (item == 1);
mathsModule->MathIndentLE->setEnabled(enable);
@@ -2920,14 +2920,9 @@ void GuiDocument::applyView()
if (rb->isChecked())
bp_.use_package(it->first, BufferParams::package_off);
}
-   bp_.is_math_indent = mathsModule->MathIndentCB->isChecked();
// if math is indented
+   bp_.is_math_indent = mathsModule->MathIndentCB->isChecked();
if (bp_.is_math_indent) {
-   Length mathindent(widgetsToLength(mathsModule->MathIndentLE,
- 
mathsModule->MathIndentLengthCO));
-   bp_.setMathIndent(mathindent);
-   }
-   if (mathsModule->MathIndentCB->isChecked()) {
// if formulas are indented
switch (mathsModule->MathIndentCO->currentIndex()) {
case 0:
@@ -3407,8 +3402,8 @@ void GuiDocument::paramsToDialog()
updateModuleInfo();
 
// math
+   mathsModule->MathIndentCB->setChecked(bp_.is_math_indent);
if (bp_.is_math_indent) {
-   mathsModule->MathIndentCB->setChecked(bp_.is_math_indent);
Length const mathindent = bp_.getMathIndent();
int indent = 0;
if (!mathindent.empty()) {
@@ -3418,7 +3413,7 @@ void GuiDocument::paramsToDialog()
indent = 1;
}
mathsModule->MathIndentCO->setCurrentIndex(indent);
-   setMathIndent(indent);
+   EnableMathIndent(indent);
}
if (bp_.math_number_before)
mathsModule->MathNumberingPosCO->setCurrentIndex(0);
@@ -4091,7 +4086,7 @@ bool GuiDocument::isValid()
!textLayoutModule->indentLE->text().isEmpty()
) &&
(
-   // if we're asking for indentation
+   // if we're asking for math indentation
!mathsModule->MathIndentCB->isChecked() ||
// then either we haven't chosen custom
mathsModule->MathIndentCO->currentIndex() != 1 ||
diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 7527a59..996fb30 100644
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -110,7 +110,7 @@ private Q_SLOTS:
void setSkip(int);
void enableSkip(bool);
void allowMathIndent();
-   void setMathIndent(int);
+   void EnableMathIndent(int);
void browseLayout();
void browseMaster();
void classChanged();

[LyX/master] GuiDocument: rename a function to follow the naming guideline

[Uwe Stöhr]

commit f109206c0536ab57babc174708dcb21b3277eb34
Author: Uwe Stöhr 
Date:   Tue May 9 21:02:03 2017 +0200

GuiDocument: rename a function to follow the naming guideline
---
 src/frontends/qt4/GuiDocument.cpp |6 +++---
 src/frontends/qt4/GuiDocument.h   |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index e58554b..99a248c 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1268,7 +1268,7 @@ GuiDocument::GuiDocument(GuiView & lv)
connect(mathsModule->MathIndentCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(mathsModule->MathIndentCO, SIGNAL(activated(int)),
-   this, SLOT(EnableMathIndent(int)));
+   this, SLOT(enableMathIndent(int)));
connect(mathsModule->MathIndentLE, SIGNAL(textChanged(const QString &)),
this, SLOT(change_adaptor()));
connect(mathsModule->MathIndentLengthCO, SIGNAL(activated(int)),
@@ -1630,7 +1630,7 @@ void GuiDocument::allowMathIndent() {
isValid();
 }
 
-void GuiDocument::EnableMathIndent(int item)
+void GuiDocument::enableMathIndent(int item)
 {
bool const enable = (item == 1);
mathsModule->MathIndentLE->setEnabled(enable);
@@ -3413,7 +3413,7 @@ void GuiDocument::paramsToDialog()
indent = 1;
}
mathsModule->MathIndentCO->setCurrentIndex(indent);
-   EnableMathIndent(indent);
+   enableMathIndent(indent);
}
if (bp_.math_number_before)
mathsModule->MathNumberingPosCO->setCurrentIndex(0);
diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 996fb30..b5e09d3 100644
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -110,7 +110,7 @@ private Q_SLOTS:
void setSkip(int);
void enableSkip(bool);
void allowMathIndent();
-   void EnableMathIndent(int);
+   void enableMathIndent(int);
void browseLayout();
void browseMaster();
void classChanged();

[LyX/master] build5-2015.bat: the option LYX_ENABLE_CXX11 is no longer available in CMake

[Uwe Stöhr]

commit 18bdb38f30b56cd7f0305bdd92d85e56b4dfc1f4
Author: Uwe Stöhr 
Date:   Tue May 9 22:08:22 2017 +0200

build5-2015.bat: the option LYX_ENABLE_CXX11 is no longer available in CMake

- also use a boolean setting for LYX_CONSOLE, see bug #10658
---
 development/cmake/build5-2015.bat |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/development/cmake/build5-2015.bat 
b/development/cmake/build5-2015.bat
index 01bec6a..cf7ecc1 100644
--- a/development/cmake/build5-2015.bat
+++ b/development/cmake/build5-2015.bat
@@ -73,7 +73,7 @@ REM start with a new cmake run
 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%
+   cmake %LYX_SOURCE% -G"Visual Studio 14 2015" -DLYX_USE_QT=QT5 
-DLYX_ENABLE_EXPORT_TESTS=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 
-DLYX_RELEASE=0 -DLYX_CONSOLE=ON -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD%
msbuild src\LyX.vcxproj /p:Configuration=Debug
msbuild src\tex2lyx\tex2lyx.vcxproj /p:Configuration=Debug
 )
@@ -81,7 +81,7 @@ if "%1%" == "devel" (
 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%
+   cmake %LYX_SOURCE% -GNinja -G"Visual Studio 14 2015" -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
 )
 

[LyX/master] build5-2015.bat: fix build script for current CMake releases

[Uwe Stöhr]

commit 5120c25872ffa4e7f08e039fbf116ba0c111a2b6
Author: Uwe Stöhr 
Date:   Wed May 10 01:38:48 2017 +0200

build5-2015.bat: fix build script for current CMake releases

- since CMake 3.5 the path to the cmake.exe is no longer by default written 
to Windows' PATH variable. Therefore this has to be done in the script.

- Windows path can contain spaces (CMake's default installation folder 
does) so we must use quotes around the paths

- set the CMAKE_PREFIX_PATH variable
---
 development/cmake/build5-2015.bat |   34 ++
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/development/cmake/build5-2015.bat 
b/development/cmake/build5-2015.bat
index cf7ecc1..edfd331 100644
--- a/development/cmake/build5-2015.bat
+++ b/development/cmake/build5-2015.bat
@@ -32,29 +32,39 @@ 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.2-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\Master\
-set LYX_BUILD=D:\LyXGit\Master\compile-2015
+set CMAKE_PATH="C:\Program Files\CMake\bin"
+set QT_PATH="C:\Qt\Qt5.6.2-MSVC2015\5.6\msvc2015\bin"
+set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2015"
+set LYX_SOURCE="D:\LyXGit\Master"
+set LYX_BUILD="D:\LyXGit\Master\compile-2015"
 
 if [%LYX_SOURCE%]==[] (
set LYX_SOURCE=%~DP0\..\..
 )
-echo LyX source: "%LYX_SOURCE%"
+echo LyX source: %LYX_SOURCE%
 
 if [%LYX_BUILD%]==[] (
set LYX_BUILD=%CD%
 )
-echo LyX build : "%LYX_BUILD%"
+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%
+) else set PATH=%GNUWIN32_DIR%\bin;%PATH%
+echo GNUWIN32_DIR : %GNUWIN32_DIR%
+
+if [%QT_PATH%]==[] (
+   echo QT_PATH not set.
+) else set PATH=%QT_PATH%;%PATH%
+echo QT_PATH : %QT_PATH%
+
+if [%CMAKE_PATH%]==[] (
+   echo CMAKE_PATH not set.
+) else set PATH=%CMAKE_PATH%;%PATH%
+echo CMAKE_PATH : %CMAKE_PATH%
 
 if not exist %LYX_BUILD% (
echo creating "%LYX_BUILD%"
@@ -68,12 +78,12 @@ if not exist %LYX_BUILD% (
 cd "%LYX_BUILD%"
 
 REM start with a new cmake run
-::del CMakeCache.txt
+::del %LYX_BUILD%\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_USE_QT=QT5 
-DLYX_ENABLE_EXPORT_TESTS=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 
-DLYX_RELEASE=0 -DLYX_CONSOLE=ON -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD%
+   cmake %LYX_SOURCE% -G"Visual Studio 14 2015" 
-DCMAKE_PREFIX_PATH=%QT_PATH% -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0 
-DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 
-DLYX_CONSOLE=ON -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD%
msbuild src\LyX.vcxproj /p:Configuration=Debug
msbuild src\tex2lyx\tex2lyx.vcxproj /p:Configuration=Debug
 )
@@ -81,7 +91,7 @@ if "%1%" == "devel" (
 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_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%
+   cmake %LYX_SOURCE% -GNinja -G"Visual Studio 14 2015" 
-DCMAKE_PREFIX_PATH=%QT_PATH% -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
 )
 

[LyX/master] GuiDocument: support also the class option reqno

[Uwe Stöhr]

commit 19cc4a1fcbd0786406b0207dbff43badb93d32ba
Author: Uwe Stöhr 
Date:   Fri May 12 01:06:05 2017 +0200

GuiDocument: support also the class option reqno

as discussed our support for the formula numbering side should be complete. 
There are document classes that uses left numbering as default and with the 
class option "reqno" this can be changed to right numbering. reqno requires the 
loading of amsamth.
---
 src/BufferParams.cpp  |8 ++--
 src/BufferParams.h|4 ++--
 src/frontends/qt4/GuiDocument.cpp |   18 --
 src/tex2lyx/Preamble.cpp  |9 +++--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index bdfbc59..ef6ad0a 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -385,7 +385,7 @@ BufferParams::BufferParams()
makeDocumentClass();
paragraph_separation = ParagraphIndentSeparation;
is_math_indent = false;
-   math_number_before = false;
+   math_number_before = "default";
quotes_style = InsetQuotesParams::EnglishQuotes;
dynamic_quotes = false;
fontsize = "default";
@@ -1640,8 +1640,12 @@ bool BufferParams::writeLaTeX(otexstream & os, 
LaTeXFeatures & features,
if (is_math_indent)
clsoptions << "fleqn,";
 
-   if (math_number_before)
+   if (math_number_before == "true")
clsoptions << "leqno,";
+   else if (math_number_before == "false") {
+   clsoptions << "reqno,";
+   features.require("amsmath");
+   }
 
// language should be a parameter to \documentclass
if (language->babel() == "hebrew"
diff --git a/src/BufferParams.h b/src/BufferParams.h
index 1c23d6c..be7c814 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -110,8 +110,8 @@ public:
bool is_math_indent;
 
 
-   /// number formulas before them
-   bool math_number_before;
+   /// number formulas before or not
+   std::string math_number_before;
 
/** Whether paragraphs are separated by using a indent like in
 *  articles or by using a little skip like in letters.
diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index 99a248c..055981e 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1283,7 +1283,8 @@ GuiDocument::GuiDocument(GuiView & lv)
bc().addCheckedLineEdit(mathsModule->MathIndentLE);
mathsModule->MathNumberingPosCO->addItem(qt_("Left"));
mathsModule->MathNumberingPosCO->addItem(qt_("Default"));
-   mathsModule->MathNumberingPosCO->setCurrentIndex(2);
+   mathsModule->MathNumberingPosCO->addItem(qt_("Right"));
+   mathsModule->MathNumberingPosCO->setCurrentIndex(1);

 
// latex class
@@ -2942,14 +2943,17 @@ void GuiDocument::applyView()
}
switch (mathsModule->MathNumberingPosCO->currentIndex()) {
case 0:
-   bp_.math_number_before = true;
+   bp_.math_number_before = "true";
break;
case 1:
-   bp_.math_number_before = false;
+   bp_.math_number_before = "default";
+   break;
+   case 2:
+   bp_.math_number_before = "false";
break;
default:
// this should never happen
-   bp_.math_number_before = false;
+   bp_.math_number_before = "default";
break;
}
 
@@ -3415,10 +3419,12 @@ void GuiDocument::paramsToDialog()
mathsModule->MathIndentCO->setCurrentIndex(indent);
enableMathIndent(indent);
}
-   if (bp_.math_number_before)
+   if (bp_.math_number_before == "true")
mathsModule->MathNumberingPosCO->setCurrentIndex(0);
-   else 
+   else if (bp_.math_number_before == "default")
mathsModule->MathNumberingPosCO->setCurrentIndex(1);
+   else if (bp_.math_number_before == "false")
+   mathsModule->MathNumberingPosCO->setCurrentIndex(2);
 
map const & packages = BufferParams::auto_packages();
for (map::const_iterator it = packages.begin();
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 9465331..cf9dab7 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -494,7 +494,7 @@ Preamble::Preamble() : one_language(true), 
explicit_babel(false),
h_font_tt_scale[1]= "100"

[LyX/master] build5-2015.bat: fix a path

[Uwe Stöhr]

commit 50f0ae9ecd3a6cdc65f97191dff0ffe567044367
Author: Uwe Stöhr 
Date:   Sat May 13 19:19:18 2017 +0200

build5-2015.bat: fix a path
---
 development/cmake/build5-2015.bat |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/development/cmake/build5-2015.bat 
b/development/cmake/build5-2015.bat
index edfd331..8274400 100644
--- a/development/cmake/build5-2015.bat
+++ b/development/cmake/build5-2015.bat
@@ -34,7 +34,7 @@ set CALLED_FROM=%CD%
 
 REM Edit pathes here or set the environment variables on your system.
 set CMAKE_PATH="C:\Program Files\CMake\bin"
-set QT_PATH="C:\Qt\Qt5.6.2-MSVC2015\5.6\msvc2015\bin"
+set QT_PATH="C:\Qt\Qt5.6.2-MSVC-2015\5.6\msvc2015\bin"
 set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2015"
 set LYX_SOURCE="D:\LyXGit\Master"
 set LYX_BUILD="D:\LyXGit\Master\compile-2015"

[LyX/master] rename buffer parameter math_number_before to math_numbering_side

[Uwe Stöhr]

commit 0dd3311dd42996f9aede7d8c58b27937ebb48b54
Author: Uwe Stöhr 
Date:   Sat May 13 20:39:45 2017 +0200

rename buffer parameter math_number_before to math_numbering_side

this is a fileformat change

also try to fix an UI issue that JMarc gets
---
 development/FORMAT |   31 ++
 lib/lyx2lyx/lyx_2_3.py |   60 +++-
 src/BufferParams.cpp   |   28 +-
 src/BufferParams.h |2 +-
 src/frontends/qt4/GuiDocument.cpp  |   10 ++--
 src/frontends/qt4/ui/MathsUi.ui|2 +-
 src/tex2lyx/Preamble.cpp   |8 +-
 src/tex2lyx/Preamble.h |2 +-
 src/tex2lyx/test/CJK.lyx.lyx   |4 +-
 src/tex2lyx/test/CJKutf8.lyx.lyx   |4 +-
 src/tex2lyx/test/DummyDocument.lyx.lyx |4 +-
 src/tex2lyx/test/Dummy~Document.lyx.lyx|4 +-
 src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx |4 +-
 src/tex2lyx/test/algo2e.lyx.lyx|4 +-
 .../test/box-color-size-space-align.lyx.lyx|4 +-
 src/tex2lyx/test/test-insets-basic.lyx.lyx |4 +-
 src/tex2lyx/test/test-insets.lyx.lyx   |4 +-
 src/tex2lyx/test/test-memoir.lyx.lyx   |4 +-
 src/tex2lyx/test/test-modules.lyx.lyx  |4 +-
 src/tex2lyx/test/test-refstyle-theorems.lyx.lyx|4 +-
 src/tex2lyx/test/test-scr.lyx.lyx  |4 +-
 src/tex2lyx/test/test-structure.lyx.lyx|4 +-
 src/tex2lyx/test/test.lyx.lyx  |4 +-
 src/tex2lyx/test/verbatim.lyx.lyx  |4 +-
 src/version.h  |4 +-
 25 files changed, 135 insertions(+), 76 deletions(-)

diff --git a/development/FORMAT b/development/FORMAT
index 07a76ca..8b28a8a 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -6,29 +6,34 @@ changes happened in particular if possible. A good example 
would be
 2010-01-10 entry.
 
 ---
+
+2017-05-13 Uwe Stöhr 
+   * Format incremented to 543: rename buffer parameter
+ math_number_before to math_numbering_side
+
 2017-04-25 Uwe Stöhr 
-   * Format incremented to 542: support for document class option "leqno"
- New buffer parameter \math_number_before
+   * Format incremented to 542: support for document class option "leqno"
+ New buffer parameter \math_number_before
 
 2017-04-19 Günter Milde 
-   * Format incremented to 541: changes \SpecialChar:
+   * Format incremented to 541: changes \SpecialChar:
  - new argument "allowbreak" to mark an optional line break
without inserting a hyphen (= ZWSP). See #10585.
 
 2017-04-15 Uwe Stöhr 
-   * Format incremented to 540: support for rotated float placements
- - no new LFUN or buffer parameters
+   * Format incremented to 540: support for rotated float placements
+ - no new LFUN or buffer parameters
 
 2017-04-08 Uwe Stöhr 
-   * Format incremented to 539: support for \baselineskip.
- - new length unit BLS
+   * Format incremented to 539: support for \baselineskip.
+ - new length unit BLS
 
 2017-04-05 Uwe Stöhr 
-   * Format incremented to 538: support for document class option "fleqn"
- and for length \mathindent.
- New buffer parameters
- - \is_math_indent
- - \math_indentation
+   * Format incremented to 538: support for document class option "fleqn"
+ and for length \mathindent.
+ New buffer parameters
+ - \is_math_indent
+     - \math_indentation
 
 2017-04-04 Uwe Stöhr 
* Format incremented to 537: support for \xout.
@@ -36,7 +41,7 @@ changes happened in particular if possible. A good example 
would be
  LFUN_FONT_CROSSOUT
 
 2017-04-04 Uwe Stöhr 
-   * Format incremented to 536: support for Noto fonts.
+   * Format incremented to 536: support for Noto fonts.
  - \usepackage[rm]{noto} > \font_roman "NotoSerif-TLF" ""
  - \usepackage[sf]{noto} > \font_sans "NotoSans-TLF" ""
  - \renewcommand{\ttdefault}{NotoMono-TLF} 
diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index 1133124..9543937 100644
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -2142,7 +2142,7 @@ def revert_allowbreak(document):
 
 
 def convert_mathnumberpos(document):
-" add the \math_number_before tag "
+" add the \\math_number_before tag "
 # check if the document uses the class option "leqno"
 k = find_token(document.header, "\\quotes_style", 0)
 regexp = re.compile(r'^.*leqno.*')
@@ -2155,7 +2155,7 @@ def conve

[LyX/master] German Intro.lyx: some refinements from Mike and me

[Uwe Stöhr]

commit 91238c16208676b08baa4d41e6495e23fae40261
Author: Uwe Stöhr 
Date:   Sun May 14 18:57:58 2017 +0200

German Intro.lyx: some refinements from Mike and me
---
 lib/doc/de/Intro.lyx |   94 ++---
 1 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/lib/doc/de/Intro.lyx b/lib/doc/de/Intro.lyx
index 1f35e54..cf3aecc 100644
--- a/lib/doc/de/Intro.lyx
+++ b/lib/doc/de/Intro.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 541
+\lyxformat 543
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -37,7 +37,7 @@
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
-\font_sc false
+\font_sc true
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
@@ -59,7 +59,7 @@
 \pdf_bookmarksnumbered true
 \pdf_bookmarksopen true
 \pdf_bookmarksopenlevel 2
-\pdf_breaklinks false
+\pdf_breaklinks true
 \pdf_pdfborder false
 \pdf_colorlinks true
 \pdf_backref false
@@ -99,7 +99,9 @@
 \paragraph_separation indent
 \paragraph_indentation default
 \is_math_indent 0
+\math_numbering_side default
 \quotes_style german
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
@@ -135,11 +137,7 @@ status open
 \begin_layout Plain Layout
 Deutsche Übersetzung: 
 \noun on
-Hartmut
-\noun default
- 
-\noun on
-Haase 
+Hartmut Haase 
 \noun default
 (
 \noun on
@@ -450,18 +448,21 @@ wie
 \begin_inset Quotes gld
 \end_inset
 
+
+\lang english
 What you see is what you 
 \emph on
 mean
 \emph default
- — Was man sieht, ist was man 
-\emph on
-meint
-\emph default
+\lang ngerman
 
 \begin_inset Quotes grd
 \end_inset
 
+ — Was man sieht, ist was man 
+\emph on
+meint
+\emph default
 .
  Dies ist ein sehr mächtiges Konzept, das das Schreiben von Texten stark
  vereinfacht.
@@ -698,11 +699,12 @@ Benutzerhandbuches
 \end_inset
 
  Es basiert auf der Textsatz-Sprache \SpecialChar TeX
-, die von 
+, die bereits Mitte der 70er Jahre
+ von 
 \noun on
-Donald Knuth 
+Donald Knuth
 \noun default
-Mitte der 70er Jahre entwickelt wurde.
+ entwickelt wurde.
  
 \begin_inset Quotes gld
 \end_inset
@@ -744,6 +746,8 @@ Knuth
 \begin_inset Quotes gld
 \end_inset
 
+
+\lang english
 device independent
 \begin_inset Quotes grd
 \end_inset
@@ -1036,7 +1040,8 @@ literal "false"
 
 .
  Falls Sie dringende Fragen haben, die in der Dokumentation offensichtlich
- nicht beantwortet werden, gibt es eine sehr aktive Mailing-Liste: 
+ nicht beantwortet werden, können sie sich an die sehr aktive Mailing-Liste
+ wenden: 
 \begin_inset CommandInset href
 LatexCommand href
 target "lyx-us...@lists.lyx.org"
@@ -1045,22 +1050,15 @@ literal "false"
 
 \end_inset
 
-.
+(englischsprachig).
  Außerdem könnten Sie bei 
-\family typewriter
-
-\begin_inset Flex URL
-status collapsed
-
-\begin_layout Plain Layout
-
-http://wiki.lyx.org
-\end_layout
+\begin_inset CommandInset href
+LatexCommand href
+target "http://wiki.lyx.org";
+literal "false"
 
 \end_inset
 
-
-\family default
  vorbeischauen.
 \end_layout
 
@@ -1144,9 +1142,9 @@ Strg+<
 
 
 \family sans
-Gehe zur
+Gehe zurück
 \family default
-ück
+
 \begin_inset Quotes grd
 \end_inset
 
@@ -2287,14 +2285,14 @@ Es mag sein, dass Sie beim Benutzen von \SpecialChar LyX
 \begin_layout Standard
 \SpecialChar LyX
  hat ein Web-basiertes Fehlermeldesystem, den \SpecialChar LyX
--Bug-Tracker 
-\begin_inset Flex URL
-status collapsed
-
-\begin_layout Plain Layout
+-Bug-Tracker
+\begin_inset Newline linebreak
+\end_inset
 
-http://www.lyx.org/trac/wiki/BugTrackerHome
-\end_layout
+ 
+\begin_inset CommandInset href
+LatexCommand href
+target "http://www.lyx.org/trac/wiki/BugTrackerHome";
 
 \end_inset
 
@@ -2315,13 +2313,9 @@ literal "false"
 .
  Archive der Liste erreichen Sie über die \SpecialChar LyX
 -Startseite 
-\begin_inset Flex URL
-status collapsed
-
-\begin_layout Plain Layout
-
-http://www.lyx.org
-\end_layout
+\begin_inset CommandInset href
+LatexCommand href
+target "http://www.lyx.org";
 
 \end_inset
 
@@ -2518,18 +2512,14 @@ Wie alle anderen Bereiche von \SpecialChar LyX
 
 \begin_layout Enumerate
 Besorgen Sie sich die neueste Version der \SpecialChar LyX
--Quellen von
+-Quellen von:
 \begin_inset Newline newline
 \end_inset
 
 
-\begin_inset Flex URL
-status collapsed
-
-\begin_layout Plain Layout
-
-http://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master
-\end_layout
+\begin_inset CommandInset href
+LatexCommand href
+target "http://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master";
 
 \end_inset
 

[LyX/master] Intro.lyx: some refinements proposed by Mike

[Uwe Stöhr]

commit c32c32747e0279040f64808668575f81dd753968
Author: Uwe Stöhr 
Date:   Sun May 14 19:49:52 2017 +0200

Intro.lyx: some refinements proposed by Mike

- use true small caps
- use hyperlinks for all types of links

- UserGuide.lyx: fix an image scaling
---
 lib/doc/Intro.lyx|   62 +++---
 lib/doc/UserGuide.lyx|5 +-
 lib/doc/de/Intro.lyx |   10 +++-
 lib/doc/de/UserGuide.lyx |7 ++-
 lib/doc/es/Intro.lyx |   61 ++---
 lib/doc/es/UserGuide.lyx |   10 -
 lib/doc/fr/Intro.lyx |  112 ++---
 lib/doc/fr/UserGuide.lyx |7 ++-
 lib/doc/ja/Intro.lyx |   67 +++
 lib/doc/ja/UserGuide.lyx |7 ++-
 10 files changed, 146 insertions(+), 202 deletions(-)

diff --git a/lib/doc/Intro.lyx b/lib/doc/Intro.lyx
index aa8d341..aea4db7 100644
--- a/lib/doc/Intro.lyx
+++ b/lib/doc/Intro.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 541
+\lyxformat 543
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -37,7 +37,7 @@
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
-\font_sc false
+\font_sc true
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
@@ -59,7 +59,7 @@
 \pdf_bookmarksnumbered true
 \pdf_bookmarksopen true
 \pdf_bookmarksopenlevel 2
-\pdf_breaklinks false
+\pdf_breaklinks true
 \pdf_pdfborder false
 \pdf_colorlinks true
 \pdf_backref false
@@ -95,7 +95,9 @@
 \paragraph_separation indent
 \paragraph_indentation default
 \is_math_indent 0
+\math_numbering_side default
 \quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
@@ -928,7 +930,7 @@ Some of you may have printed out the manuals.
  To open a footnote, which looks like this: 
 \begin_inset Graphics
filename clipart/footnote.png
-   scale 75
+   scale 95
 
 \end_inset
 
@@ -950,7 +952,7 @@ In the printed manuals, all cross-references appear as the 
actual numbers
  like the following: 
 \begin_inset Graphics
filename clipart/reference.png
-   scale 75
+   scale 95
 
 \end_inset
 
@@ -1266,7 +1268,11 @@ PageDown
 \begin_inset Quotes erd
 \end_inset
 
-: these are the 6 keys that appear above the cursor keys on many PC keyboards.
+: these are the 6
+\begin_inset space ~
+\end_inset
+
+keys that appear above the cursor keys on many PC keyboards.
  
 \begin_inset Quotes eld
 \end_inset
@@ -2143,21 +2149,17 @@ While using \SpecialChar LyX
 
 \begin_layout Standard
 \SpecialChar LyX
- has a bug tracking system, which you can find at 
-\family typewriter
-
-\begin_inset Flex URL
-status collapsed
+ has a bug tracking system, which you can find at
+\begin_inset Newline newline
+\end_inset
 
-\begin_layout Plain Layout
 
-http://www.lyx.org/trac/wiki/BugTrackerHome
-\end_layout
+\begin_inset CommandInset href
+LatexCommand href
+target "http://www.lyx.org/trac/wiki/BugTrackerHome";
 
 \end_inset
 
-
-\family default
 .
  You should check the bug tracker before reporting any bugs, in case it
  has already been reported.
@@ -2175,20 +2177,12 @@ literal "false"
 .
  Archives of this list are linked from the main \SpecialChar LyX
  website, 
-\family typewriter
-
-\begin_inset Flex URL
-status collapsed
-
-\begin_layout Plain Layout
-
-http://www.lyx.org/
-\end_layout
+\begin_inset CommandInset href
+LatexCommand href
+target "http://www.lyx.org";
 
 \end_inset
 
-
-\family default
 .
 \end_layout
 
@@ -2196,7 +2190,7 @@ http://www.lyx.org/
 A useful bug report will at a minimum include the version of \SpecialChar LyX
  you are having
  the problem with.
- Accurate, detailed descriptions are preferred - the more time developers
+ Accurate, detailed descriptions are preferred — the more time developers
  have to spend to pinpoint the source of a bug, the less time they have
  for other improvements.
  Mention the system and system version on which you are running \SpecialChar 
LyX
@@ -2276,17 +2270,13 @@ Get the latest \SpecialChar LyX
 \end_inset
 
 
-\begin_inset Flex URL
-status collapsed
-
-\begin_layout Plain Layout
-
-http://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master
-\end_layout
+\begin_inset CommandInset href
+LatexCommand href
+target "http://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master "
 
 \end_inset
 
- 
+
 \end_layout
 
 \begin_layout Enumerate
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 8fb1dc7..98690e4 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 541
+\lyxformat 543
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -133,6 +133,7 @@ enumitem
 \paragraph_separation skip
 \defskip medskip
 \is_math_indent 0
+\math_numbering_side default
 \quotes_style english
 \dynamic_quotes 0
 \papercolu

[LyX/master] French Intro.lyx: some refinements proposed by Mike

[Uwe Stöhr]

commit 25c1c6bb9543dbf90814c284fcd0a5d724eb
Author: Uwe Stöhr 
Date:   Sun May 14 19:56:59 2017 +0200

French Intro.lyx: some refinements proposed by Mike
---
 lib/doc/fr/Intro.lyx |   18 ++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/lib/doc/fr/Intro.lyx b/lib/doc/fr/Intro.lyx
index d86d477..73bc861 100644
--- a/lib/doc/fr/Intro.lyx
+++ b/lib/doc/fr/Intro.lyx
@@ -298,7 +298,11 @@ En d'autres termes, nous avons tous été habitués à nous 
soucier de l'emplace
 \begin_inset Quotes cld
 \end_inset
 
+
+\lang english
 What You See Is What You Get
+\lang french
+
 \begin_inset Quotes crd
 \end_inset
 
@@ -325,7 +329,11 @@ Vous voyez ce que vous obtenez.
 \begin_inset Quotes cld
 \end_inset
 
+
+\lang english
 What You See Is All You Get
+\lang french
+
 \begin_inset Quotes crd
 \end_inset
 
@@ -500,7 +508,11 @@ Ainsi, l'idée maîtresse avec \SpecialChar LyX
 \begin_inset Quotes cld
 \end_inset
 
+
+\lang english
 What You See Is What You Get
+\lang french
+
 \begin_inset Foot
 status collapsed
 
@@ -519,9 +531,13 @@ NdT : Vous voyez ce que vous obtenez.
 \begin_inset Quotes cld
 \end_inset
 
+
+\lang english
 What You See Is What You 
 \emph on
 Mean
+\lang french
+
 \begin_inset Foot
 status collapsed
 
@@ -826,8 +842,10 @@ pdf
 
 
 \emph on
+\lang english
 device independent
 \emph default
+\lang french
 
 \begin_inset Foot
 status collapsed

[LyX/master] Italian Intro.lyx: corrections and refinements by Mike and me

[Uwe Stöhr]

commit c6acfc75b1d2b0d10aa6a18d8ff6b259ef2e78df
Author: Uwe Stöhr 
Date:   Sun May 14 20:18:10 2017 +0200

Italian Intro.lyx: corrections and refinements by Mike and me
---
 lib/doc/it/Intro.lyx |  229 +++---
 1 files changed, 104 insertions(+), 125 deletions(-)

diff --git a/lib/doc/it/Intro.lyx b/lib/doc/it/Intro.lyx
index cb2b3ea..897f78c 100644
--- a/lib/doc/it/Intro.lyx
+++ b/lib/doc/it/Intro.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 541
+\lyxformat 543
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -37,7 +37,7 @@
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
-\font_sc false
+\font_sc true
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
@@ -59,7 +59,7 @@
 \pdf_bookmarksnumbered true
 \pdf_bookmarksopen true
 \pdf_bookmarksopenlevel 2
-\pdf_breaklinks false
+\pdf_breaklinks true
 \pdf_pdfborder false
 \pdf_colorlinks true
 \pdf_backref false
@@ -95,7 +95,9 @@
 \paragraph_separation indent
 \paragraph_indentation default
 \is_math_indent 0
+\math_numbering_side default
 \quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
@@ -243,11 +245,15 @@ bulazioni per aggiungere spazi.
  nella pagina.
  Enfatizzare il testo significa cambiare un font, analogamente alla 
sostituzione
  di un rullo nella vecchia macchina da scrivere.
- E' la filosofia di fondo del WYSIWYG,
+ E' la filosofia di fondo del WYSIWYG, 
 \begin_inset Quotes eld
 \end_inset
 
+
+\lang english
 What you see is what you get
+\lang italian
+
 \begin_inset Quotes erd
 \end_inset
 
@@ -260,11 +266,15 @@ Quello che vedi è quello che ottieni
 \end_inset
 
 ).
- Sfortunatamente, questo modello spesso finisce per diventare
+ Sfortunatamente, questo modello spesso finisce per diventare 
 \begin_inset Quotes eld
 \end_inset
 
+
+\lang english
 What you see is all you get
+\lang italian
+
 \begin_inset Quotes erd
 \end_inset
 
@@ -291,7 +301,7 @@ to carattere.
 \emph on
 stile
 \emph default
-
+.
 \begin_inset Foot
 status collapsed
 
@@ -305,13 +315,12 @@ Per correttezza, va detto che la maggiorparte degli 
attuali pacchetti di
 
 \end_inset
 
-.
  Vediamo un piccolo esempio.
 \end_layout
 
 \begin_layout Standard
 Immaginiamo che stiate scrivendo una relazione.
- Volete cominciarla con una sezione chiamata
+ Volete cominciarla con una sezione chiamata 
 \begin_inset Quotes eld
 \end_inset
 
@@ -323,7 +332,7 @@ Introduzione
  Quindi, nel vostro word processor, entrate in qualunque menù che vi consenta
  di cambiare la dimensione del carattere, e ne selezionate una.
  Poi attivate il grassetto.
- Quindi, scrivete
+ Quindi, scrivete 
 \begin_inset Quotes eld
 \end_inset
 
@@ -353,7 +362,7 @@ In \SpecialChar LyX
 \family sans
 Sezione
 \family default
-, e scrivete
+, e scrivete 
 \begin_inset Quotes eld
 \end_inset
 
@@ -416,19 +425,22 @@ come
 \emph default
  farla.
  Il modello di \SpecialChar LyX
- non è WYSIWYG, ma WYSIWYM, ossia
+ non è WYSIWYG, ma WYSIWYM, ossia 
 \begin_inset Quotes eld
 \end_inset
 
+
+\lang english
 What You See Is What You
 \emph on
-Mean
+ Mean
 \emph default
+\lang italian
 
 \begin_inset Quotes erd
 \end_inset
 
-(
+ (
 \begin_inset Quotes eld
 \end_inset
 
@@ -460,30 +472,7 @@ Differenze tra \SpecialChar LyX
 status collapsed
 
 \begin_layout Plain Layout
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-texorpdfstring{
-\end_layout
-
-\end_inset
-
 \SpecialChar LyX
-
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-}{LyX}
-\end_layout
-
-\end_inset
-
  e altri word processor
 \end_layout
 
@@ -508,11 +497,11 @@ Tabulazioni.
 \begin_layout Itemize
 Spazio extra (cioè premere
 \family sans
-Enter
+ Enter
 \family default
  o
 \family sans
-Spazio
+ Spazio
 \family default
  due o più volte).
 \end_layout
@@ -651,7 +640,7 @@ Cos'è \SpecialChar LaTeX
 \begin_layout Standard
 \SpecialChar LaTeX
  è un sistema per la preparazione di documenti, progettato da Leslie Lamport
- nel 1985
+ nel 1985.
 \begin_inset Foot
 status collapsed
 
@@ -678,7 +667,6 @@ Guida utente
 
 \end_inset
 
-.
  E' stato implementato a partire da un linguaggio di composizione tipografica
  chiamato \SpecialChar TeX
 , creato da Donald Knuth nel 1984.
@@ -706,9 +694,9 @@ li, e incorporati in \SpecialChar TeX
  L'ouput di \SpecialChar TeX
  è un documento portabile di tipo
 \emph on
-pdf
+ pdf
 \emph default
-, o un cosiddetto
+, o un cosiddetto 
 \begin_inset Quotes eld
 \end_inset
 
@@ -718,7 +706,7 @@ file indipendente dalla periferica
 
  in formato
 \emph on
-dvi
+ dvi
 \emph default
 .
  Il formato dvi viene spesso usato per la creazione di anteprime di stampa,
@@ -773,7 +761,7 @@ Esistono due metodi per estendere le potenzialità di 
\SpecialChar LaTeX
 : classi e stili.
  Una
 \emph on
-classe
+ classe
 \emph default
  è un set di macro \Spec

[LyX/master] Dutch doc files: some refinements

[Uwe Stöhr]

commit 4a7fac21ed50b31a2d70170fd8c0b4179c2a51c3
Author: Uwe Stöhr 
Date:   Sun May 14 20:41:01 2017 +0200

Dutch doc files: some refinements

the files are outdated but the should nevertheless nice in the output.
---
 lib/doc/nl/Intro.lyx|   35 +--
 lib/doc/nl/Tutorial.lyx |  757 ---
 2 files changed, 198 insertions(+), 594 deletions(-)

diff --git a/lib/doc/nl/Intro.lyx b/lib/doc/nl/Intro.lyx
index 7749c51..3bf7e9d 100644
--- a/lib/doc/nl/Intro.lyx
+++ b/lib/doc/nl/Intro.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 541
+\lyxformat 543
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -37,7 +37,7 @@
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
-\font_sc false
+\font_sc true
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
@@ -59,7 +59,7 @@
 \pdf_bookmarksnumbered true
 \pdf_bookmarksopen true
 \pdf_bookmarksopenlevel 2
-\pdf_breaklinks false
+\pdf_breaklinks true
 \pdf_pdfborder false
 \pdf_colorlinks true
 \pdf_backref false
@@ -95,7 +95,9 @@
 \paragraph_separation indent
 \paragraph_indentation default
 \is_math_indent 0
+\math_numbering_side default
 \quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
@@ -596,8 +598,11 @@ PageDown
 \begin_inset Quotes erd
 \end_inset
 
-: dit zijn de 6 toetsen die bij veel toetsenborden boven de cursortoetsen
- zitten.
+: dit zijn de 6
+\begin_inset space ~
+\end_inset
+
+toetsen die bij veel toetsenborden boven de cursortoetsen zitten.
  Op sommige toetsenborden heten de 
 \begin_inset Quotes eld
 \end_inset
@@ -1112,13 +1117,9 @@ Verander nooit iets in een handleiding zonder 
toestemming van het Documentatie
  has a bug tracking system, which you can find at
 \lang dutch
  
-\begin_inset Flex URL
-status collapsed
-
-\begin_layout Plain Layout
-
-http://www.lyx.org/trac/wiki/BugTrackerHome
-\end_layout
+\begin_inset CommandInset href
+LatexCommand href
+target "http://www.lyx.org/trac/wiki/BugTrackerHome";
 
 \end_inset
 
@@ -1241,13 +1242,9 @@ nadat
  we via email contact met elkaar hebben gehad.
  Op de webpagina van het Documentatie Team, of via de archieven van de 
mailingli
 jsten op 
-\begin_inset Flex URL
-status collapsed
-
-\begin_layout Plain Layout
-
-http://www.lyx.org
-\end_layout
+\begin_inset CommandInset href
+LatexCommand href
+target "http://www.lyx.org";
 
 \end_inset
 
diff --git a/lib/doc/nl/Tutorial.lyx b/lib/doc/nl/Tutorial.lyx
index a0c2da7..13ea04c 100644
--- a/lib/doc/nl/Tutorial.lyx
+++ b/lib/doc/nl/Tutorial.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 541
+\lyxformat 543
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -36,7 +36,7 @@
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
-\font_sc false
+\font_sc true
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
@@ -58,13 +58,13 @@
 \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 default
+\papersize a4paper
 \use_geometry false
 \use_package amsmath 0
 \use_package amssymb 0
@@ -94,7 +94,9 @@
 \paragraph_separation indent
 \paragraph_indentation default
 \is_math_indent 0
+\math_numbering_side default
 \quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
@@ -250,7 +252,7 @@ Tutorial
 status collapsed
 
 \begin_layout Plain Layout
-anders gezegd , 
+anders gezegd, 
 \begin_inset Quotes eld
 \end_inset
 
@@ -621,7 +623,11 @@ wat je ziet is wat je bedoelt
 \begin_inset Quotes eld
 \end_inset
 
+
+\lang english
 what you see is what you mean
+\lang dutch
+
 \begin_inset Quotes erd
 \end_inset
 
@@ -639,19 +645,6 @@ WYSIWYM
 \begin_layout Subsection
 Verschillen tussen \SpecialChar LyX
  en Tekstverwerkers
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-texorpdfstring{
-\end_layout
-
-\end_inset
-
-
 \begin_inset Foot
 status collapsed
 
@@ -668,29 +661,11 @@ Nee, we proberen hier niet een heilige oorlog over 
tekstverwerkers te starten
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Argument 1
 status collapsed
 
 \begin_layout Plain Layout
-
-}{}
-\end_layout
-
-\end_inset
-
-
-\begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-
-\series bold
-\lang english
-
-\backslash
-texorpdfstring
-\series default
- is used to avoid that the footnote appears in the PDF-bookmark.
+Verschillen tussen en Tekstverwerkers
 \end_layout
 
 \end_inset

[LyX/master] French Shortcuts.lyx: set proper page margins

[Uwe Stöhr]

commit 78b5684db69127c2c9f82bcc02f9c2568b347247
Author: Uwe Stöhr 
Date:   Sun May 14 20:54:41 2017 +0200

French Shortcuts.lyx: set proper page margins

- we use the standard article class and as the tables are very long in 
French we must set the page size and margins
---
 lib/doc/fr/Shortcuts.lyx |   10 +++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/doc/fr/Shortcuts.lyx b/lib/doc/fr/Shortcuts.lyx
index a48b44e..5a20efc 100644
--- a/lib/doc/fr/Shortcuts.lyx
+++ b/lib/doc/fr/Shortcuts.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 541
+\lyxformat 543
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -31,8 +31,8 @@
 \paperfontsize default
 \spacing single
 \use_hyperref false
-\papersize default
-\use_geometry false
+\papersize a4paper
+\use_geometry true
 \use_package amsmath 1
 \use_package amssymb 1
 \use_package cancel 0
@@ -56,12 +56,16 @@
 \shortcut idx
 \color #008000
 \end_index
+\leftmargin 2.5cm
+\rightmargin 2.5cm
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent
 \paragraph_indentation default
 \is_math_indent 0
+\math_numbering_side default
 \quotes_style swiss
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 1
 \paperpagestyle empty

[LyX/master] French Shortcuts.lyx: change paragraph separation

[Uwe Stöhr]

commit 36e5d5600ec51e1b56a81a3e6bd15ee1c74ddac5
Author: Uwe Stöhr 
Date:   Sun May 14 21:02:31 2017 +0200

French Shortcuts.lyx: change paragraph separation

- this also saves some horizontal space and looks better; suggested by Mike 
on the lyx-docs list
---
 lib/doc/fr/Shortcuts.lyx |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/doc/fr/Shortcuts.lyx b/lib/doc/fr/Shortcuts.lyx
index 5a20efc..888c37f 100644
--- a/lib/doc/fr/Shortcuts.lyx
+++ b/lib/doc/fr/Shortcuts.lyx
@@ -57,11 +57,11 @@
 \color #008000
 \end_index
 \leftmargin 2.5cm
-\rightmargin 2.5cm
+\rightmargin 3cm
 \secnumdepth 3
 \tocdepth 3
-\paragraph_separation indent
-\paragraph_indentation default
+\paragraph_separation skip
+\defskip medskip
 \is_math_indent 0
 \math_numbering_side default
 \quotes_style swiss

[LyX/master] de.po: correct 2 translations

[Uwe Stöhr]

commit 320804a20eccdd45d0c543a6bb5cecb5478df747
Author: Uwe Stöhr 
Date:   Mon May 15 02:38:14 2017 +0200

de.po: correct 2 translations
---
 po/de.po |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/de.po b/po/de.po
index d30cdad..e3598d0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -96,7 +96,7 @@ msgstr ""
 "Project-Id-Version: LyX 2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2017-05-14 18:18+0200\n"
-"PO-Revision-Date: 2017-05-14 18:26+0200\n"
+"PO-Revision-Date: 2017-05-15 02:37+0200\n"
 "Last-Translator: Uwe Stöhr \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -4677,12 +4677,12 @@ msgid ""
 "Use capitalized form of formatted reference. (Works only for formatted "
 "references, and only if you are using refstyle.)"
 msgstr ""
-"Verwende Anfangsgroßschreibung bei formatierten Querverweisen. Dies "
-"funktioniert nur bei formatierten Querverweisen und mit Refstyle."
+"Verwende Großschreibung bei formatierten Querverweisen. (Funktioniert nur "
+"bei formatierten Querverweisen und nur, wenn man refstyle verwendet.)"
 
 #: src/frontends/qt4/ui/RefUi.ui:402
 msgid "Capitalized"
-msgstr "Anfangsgroßschreibung"
+msgstr "Großschreibung"
 
 #: src/frontends/qt4/ui/RefUi.ui:409
 msgid "Do not output part of label before \":\""

[LyX/master] EmbeddedObjects.lyx: start updating for LyX 2.3

[Uwe Stöhr]

commit 8bf3d7bb1ab618bb1afca0a9926b46598bb46352
Author: Uwe Stöhr 
Date:   Mon May 15 02:48:07 2017 +0200

EmbeddedObjects.lyx: start updating for LyX 2.3

- add new vector images (the SVG files are only the sources and are 
therefore purposely not added to Makefile.am)
 On the lyx-docs list it was reported that our current images look old and 
pixelated and I agree, so that I just draw new ones.
---
 lib/doc/Changelog-EmbeddedObjects-LyX_22x.txt |   28 
 lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt |   37 +
 lib/doc/EmbeddedObjects.lyx   |  181 +++
 lib/doc/Makefile.am   |3 +
 lib/doc/clipart/2D-intensity-plot.pdf |  Bin 0 -> 55237 bytes
 lib/doc/clipart/3D-structure-distort.pdf  |   68 +
 lib/doc/clipart/3D-structure-distort.svg  |  112 ++
 lib/doc/clipart/Star-structure.pdf|  Bin 0 -> 3319 bytes
 lib/doc/clipart/Star-structure.svg|  201 +
 lib/doc/de/EmbeddedObjects.lyx|  172 +-
 lib/doc/es/EmbeddedObjects.lyx|  174 ++
 lib/doc/fr/EmbeddedObjects.lyx|  170 ++---
 lib/doc/ja/EmbeddedObjects.lyx|  169 ++---
 13 files changed, 1113 insertions(+), 202 deletions(-)

diff --git a/lib/doc/Changelog-EmbeddedObjects-LyX_22x.txt 
b/lib/doc/Changelog-EmbeddedObjects-LyX_22x.txt
deleted file mode 100644
index c2d6896..000
--- a/lib/doc/Changelog-EmbeddedObjects-LyX_22x.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-For LyX 2.2.3:
-
-- sec. 2.11.3: new description of how to change table line colors 
-
-
-For LyX 2.2.0:
-
-Modified:
-
-first step:
-- sec. 2.2: (Japanese only) added a sentence
-- sec. 3.8: new paragraph
-- sec. 5.2.3: 2 changed sentences
-- sec. 5.3: (Japanese only) changed sentence
-- sec. 5.4: new paragraph
-- sec. 5.7: complete revision
-- sec. 5.8: complete revision
-- Appendix A: new strings in the table
-
-second step:
-- the term "longtable" was replaced by "multi-page table"
-  please rename all occurrences (including the cross-references and the index
-  entries)of longtable accordingly
-  occurrences: sec. 2.2, 2.6, 2.7, 4.2
-- sec. 7.1: new template "vector graphics"
-
-third step:
-- sec. 2.6.3.3: (Japanese only) caption type "LongTableNoNumber" has been 
renamed to "Unumbered"
diff --git a/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt 
b/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt
new file mode 100644
index 000..a6919d2
--- /dev/null
+++ b/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt
@@ -0,0 +1,37 @@
+For LyX 2.3.0:
+
+Modified:
+
+first step:
+- sec. 1.2: changed image captions and labels
+- sec. 3.4.1: new paragraphs
+
+
+For LyX 2.2.3:
+
+- sec. 2.11.3: new description of how to change table line colors 
+
+
+For LyX 2.2.0:
+
+Modified:
+
+first step:
+- sec. 2.2: (Japanese only) added a sentence
+- sec. 3.8: new paragraph
+- sec. 5.2.3: 2 changed sentences
+- sec. 5.3: (Japanese only) changed sentence
+- sec. 5.4: new paragraph
+- sec. 5.7: complete revision
+- sec. 5.8: complete revision
+- Appendix A: new strings in the table
+
+second step:
+- the term "longtable" was replaced by "multi-page table"
+  please rename all occurrences (including the cross-references and the index
+  entries)of longtable accordingly
+  occurrences: sec. 2.2, 2.6, 2.7, 4.2
+- sec. 7.1: new template "vector graphics"
+
+third step:
+- sec. 2.6.3.3: (Japanese only) caption type "LongTableNoNumber" has been 
renamed to "Unumbered"
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 42d4257..ac55b31 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 541
+\lyxformat 543
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -226,6 +226,7 @@ graphicboxes
 \paragraph_separation skip
 \defskip medskip
 \is_math_indent 0
+\math_numbering_side default
 \quotes_style english
 \dynamic_quotes 0
 \papercolumns 1
@@ -237,7 +238,6 @@ graphicboxes
 \html_css_as_file 0
 \html_be_strict false
 \author 227574939 "Kyttj"
-\author 424524441 "rgheck"
 \author 2047637253 "Guillaume Munch"
 \end_header
 
@@ -632,7 +632,7 @@ Figures ! Settings grouping
 \end_layout
 
 \begin_layout Standard
-This is an example image in EPS format
+This is an example image in PDF format
 \begin_inset Foot
 status collapsed
 
@@ -659,8 +659,7 @@ reference "sec:Image-Formats"
 \begin_layout Standard
 \align center
 \begin_inset Graphics
-   filename clipart/mobius.eps
-   scale 70
+   filename clipart/2D-intensity-plot.pdf
scaleBeforeRotation
rotateOrigin center
 
@@ -676,8 +675,7 @@ This is the same image like t

[LyX/2.2.x] InsetFloat.cpp: backport fix for bug #10618

[Uwe Stöhr]

commit e40205e749a367979469a599a1184bea66740cf6
Author: Uwe Stöhr 
Date:   Tue May 16 23:44:32 2017 +0200

InsetFloat.cpp: backport fix for bug #10618
---
 src/insets/InsetFloat.cpp |2 +-
 status.22x|2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index ae1bf63..89a0fbe 100644
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -127,7 +127,7 @@ void InsetFloat::setCaptionType(std::string const & type)
params_.type = captionType();
// check if the float type exists
if (buffer().params().documentClass().floats().typeExist(params_.type))
-   setLabel(_("float: ") + floatName(params_.type));
+   setNewLabel();
else
setLabel(bformat(_("ERROR: Unknown float type: %1$s"), 
from_utf8(params_.type)));
 }
diff --git a/status.22x b/status.22x
index 5f3cc9a..c59e02d 100644
--- a/status.22x
+++ b/status.22x
@@ -45,6 +45,8 @@ What's new
 
 - Remove duplicate entries from the Symbols dialog (bug 10644).
 
+- Always shows the float type in the float inset label (bug 10618).
+
 
 * INTERNALS
 

[LyX/2.2.x] Color.cpp: backport fix for bug #10656

[Uwe Stöhr]

commit 7b0f63f67b31fe78b242fb03f4dee7a538420539
Author: Uwe Stöhr 
Date:   Tue May 16 23:47:35 2017 +0200

Color.cpp: backport fix for bug #10656
---
 src/Color.cpp |2 +-
 status.22x|2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/Color.cpp b/src/Color.cpp
index 5eda834..b405dc4 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -298,7 +298,7 @@ ColorSet::ColorSet()
{ Color_paragraphmarker, N_("paragraph marker"), "paragraphmarker", 
grey80, "paragraphmarker"},
{ Color_previewframe, N_("preview frame"), "previewframe", "black", 
"previewframe"},
{ Color_inherit, N_("inherit"), "inherit", "black", "inherit" },
-   { Color_regexpframe, N_("regexp frame"), "green", "green", "green" },
+   { Color_regexpframe, N_("regexp frame"), "regexpframe", "green", 
"regexpframe" },
{ Color_ignore, N_("ignore"), "ignore", "black", "ignore" },
{ Color_ignore, 0, 0, 0, 0 }
};
diff --git a/status.22x b/status.22x
index c59e02d..bed1d56 100644
--- a/status.22x
+++ b/status.22x
@@ -47,6 +47,8 @@ What's new
 
 - Always shows the float type in the float inset label (bug 10618).
 
+- Show correct color name for green in the status bar (bug 10656).
+
 
 * INTERNALS
 

[LyX/master] lyx_2_3.py: remove senseless warning

[Uwe Stöhr]

commit 220f504941ebf3542ee1e8e971e4d2e9d5295cd5
Author: Uwe Stöhr 
Date:   Wed May 17 01:11:58 2017 +0200

lyx_2_3.py: remove senseless warning
---
 lib/lyx2lyx/lyx_2_3.py |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index 256a231..6698654 100644
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -2183,7 +2183,6 @@ def revert_mathnumberpos(document):
 
 def convert_mathnumberingname(document):
 " rename the \\math_number_before tag to \\math_numbering_side "
-document.warning("Malformed LyX document: Missing '\\end_inset' of Float 
inset.")
 regexp = re.compile(r'(\\math_number_before 1)')
 i = find_re(document.header, regexp, 0)
 if i != -1:

[LyX/master] lyx_2_3.py: assure that leqno /reqno is only handled if it is a document class option

[Uwe Stöhr]

commit bc9a7a21c8cbfcd3427f9c1741a0999273bc1795
Author: Uwe Stöhr 
Date:   Wed May 17 01:23:59 2017 +0200

lyx_2_3.py: assure that leqno /reqno is only handled if it is a document 
class option
---
 lib/lyx2lyx/lyx_2_3.py |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index 6698654..cda390d 100644
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -2146,9 +2146,10 @@ def convert_mathnumberpos(document):
 " add the \\math_number_before tag "
 # check if the document uses the class option "leqno"
 k = find_token(document.header, "\\quotes_style", 0)
+m = find_token(document.header, "\\options", 0)
 regexp = re.compile(r'^.*leqno.*')
 i = find_re(document.header, regexp, 0)
-if i != -1:
+if i != -1 and i == m:
 document.header.insert(k, "\\math_number_before 1")
 # delete the found option
 document.header[i] = document.header[i].replace(",leqno", "")
@@ -2193,9 +2194,10 @@ def convert_mathnumberingname(document):
 document.header[i] = "\\math_numbering_side default"
 # check if the document uses the class option "reqno"
 k = find_token(document.header, "\\math_numbering_side", 0)
+m = find_token(document.header, "\\options", 0)
 regexp = re.compile(r'^.*reqno.*')
 i = find_re(document.header, regexp, 0)
-if i != -1:
+if i != -1 and i == m:
 document.header[k] = "\\math_numbering_side right"
 # delete the found option
 document.header[i] = document.header[i].replace(",reqno", "")

[LyX/master] EmbeddedObjects.lyx: use the new example images on all occurrences

[Uwe Stöhr]

commit 25e3c0083882b46b4cc5dc86be7a0c684e71c97a
Author: Uwe Stöhr 
Date:   Wed May 17 01:36:48 2017 +0200

EmbeddedObjects.lyx: use the new example images on all occurrences
---
 lib/doc/EmbeddedObjects.lyx|   18 +++---
 lib/doc/de/EmbeddedObjects.lyx |   18 +++---
 lib/doc/es/EmbeddedObjects.lyx |   18 +++---
 lib/doc/fr/EmbeddedObjects.lyx |   18 +++---
 lib/doc/ja/EmbeddedObjects.lyx |   18 +++---
 5 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index ac55b31..80317ec 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -28279,8 +28279,7 @@ status open
 \begin_layout Plain Layout
 \align center
 \begin_inset Graphics
-   filename clipart/mobius.eps
-   lyxscale 50
+   filename clipart/2D-intensity-plot.pdf
width 100col%
scaleBeforeRotation
 
@@ -28335,8 +28334,7 @@ status open
 \begin_layout Plain Layout
 \align center
 \begin_inset Graphics
-   filename clipart/platypus.eps
-   lyxscale 50
+   filename clipart/Star-structure.pdf
width 100col%
scaleBeforeRotation
 
@@ -28854,9 +28852,7 @@ status open
 \begin_layout Plain Layout
 \align center
 \begin_inset Graphics
-   filename clipart/mobius.eps
-   lyxscale 50
-   scale 50
+   filename clipart/2D-intensity-plot.pdf
scaleBeforeRotation
 
 \end_inset
@@ -30245,8 +30241,8 @@ status open
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-   filename clipart/escher-lsd.eps
-   scale 75
+   filename clipart/3D-structure-distort.pdf
+   scale 50
scaleBeforeRotation
 
 \end_inset
@@ -30592,8 +30588,8 @@ status open
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-   filename clipart/escher-lsd.eps
-   scale 75
+   filename clipart/3D-structure-distort.pdf
+   scale 50
scaleBeforeRotation
 
 \end_inset
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index d3e85d7..ec70490 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -28399,8 +28399,7 @@ status open
 \begin_layout Plain Layout
 \align center
 \begin_inset Graphics
-   filename ../clipart/mobius.eps
-   lyxscale 50
+   filename ../clipart/2D-intensity-plot.pdf
width 100col%
scaleBeforeRotation
 
@@ -28455,8 +28454,7 @@ status open
 \begin_layout Plain Layout
 \align center
 \begin_inset Graphics
-   filename ../clipart/platypus.eps
-   lyxscale 50
+   filename ../clipart/Star-structure.pdf
width 100col%
scaleBeforeRotation
 
@@ -28939,9 +28937,7 @@ status open
 \begin_layout Plain Layout
 \align center
 \begin_inset Graphics
-   filename ../clipart/mobius.eps
-   lyxscale 50
-   scale 50
+   filename ../clipart/2D-intensity-plot.pdf
scaleBeforeRotation
 
 \end_inset
@@ -30345,8 +30341,8 @@ status open
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-   filename ../clipart/escher-lsd.eps
-   scale 75
+   filename ../clipart/3D-structure-distort.pdf
+   scale 50
scaleBeforeRotation
 
 \end_inset
@@ -30695,8 +30691,8 @@ status open
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-   filename ../clipart/escher-lsd.eps
-   scale 75
+   filename ../clipart/3D-structure-distort.pdf
+   scale 50
scaleBeforeRotation
 
 \end_inset
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index f680421..76464e5 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -28054,8 +28054,7 @@ status open
 \begin_layout Plain Layout
 \align center
 \begin_inset Graphics
-   filename ../clipart/mobius.eps
-   lyxscale 50
+   filename ../clipart/2D-intensity-plot.pdf
width 100col%
scaleBeforeRotation
 
@@ -28110,8 +28109,7 @@ status open
 \begin_layout Plain Layout
 \align center
 \begin_inset Graphics
-   filename ../clipart/platypus.eps
-   lyxscale 50
+   filename ../clipart/Star-structure.pdf
width 100col%
scaleBeforeRotation
 
@@ -28585,9 +28583,7 @@ status open
 \begin_layout Plain Layout
 \align center
 \begin_inset Graphics
-   filename ../clipart/mobius.eps
-   lyxscale 50
-   scale 50
+   filename ../clipart/2D-intensity-plot.pdf
 
 \end_inset
 
@@ -29984,8 +29980,8 @@ status open
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-   filename ../clipart/escher-lsd.eps
-   scale 75
+   filename ../clipart/3D-structure-distort.pdf
+   scale 50
 
 \end_inset
 
@@ -30333,8 +30329,8 @@ status open
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-   filename ../clipart/escher-lsd.eps
-   scale 75
+   filename ../clipart/3D-structure-distort.pdf
+   scale 50
 
 \end_inset
 
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index cb86c0a..6678815

[LyX/master] EmbeddedObjects.lyx: document new template for Inkscape

[Uwe Stöhr]

commit 1f6104fe71d5f4ca448f7ff9ce5c7a3be28f6d68
Author: Uwe Stöhr 
Date:   Sun May 21 18:10:46 2017 +0200

EmbeddedObjects.lyx: document new template for Inkscape

Note that this template has several issues, see bug #10679
---
 lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt |2 +
 lib/doc/EmbeddedObjects.lyx   |  269 ++---
 lib/doc/de/EmbeddedObjects.lyx|  118 ++-
 lib/doc/es/EmbeddedObjects.lyx|  136 ++---
 lib/doc/fr/EmbeddedObjects.lyx|  132 +++-
 lib/doc/ja/EmbeddedObjects.lyx|  108 +-
 6 files changed, 501 insertions(+), 264 deletions(-)

diff --git a/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt 
b/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt
index a6919d2..a0b2c49 100644
--- a/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt
+++ b/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt
@@ -5,6 +5,8 @@ Modified:
 first step:
 - sec. 1.2: changed image captions and labels
 - sec. 3.4.1: new paragraphs
+- sec. 7.1: new description item for Inkscape drawings
+- bibliography: new entry for Inkscape
 
 
 For LyX 2.2.3:
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 80317ec..255c2ab 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -232,13 +232,11 @@ graphicboxes
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
-\author 227574939 "Kyttj"
-\author 2047637253 "Guillaume Munch"
 \end_header
 
 \begin_body
@@ -40032,8 +40030,6 @@ Xfig
 \end_inset
 
 figure This template supports images created with the program 
-\series bold
-
 \begin_inset CommandInset href
 LatexCommand href
 name "Xfig"
@@ -40042,234 +40038,91 @@ literal "false"
 
 \end_inset
 
-
-\series default
 .
-\change_inserted 227574939 1473131626
-
 \end_layout
 
 \begin_layout Description
-
-\change_inserted 227574939 1473131628
 Inkscape
 \begin_inset space ~
 \end_inset
 
-figure This experimental template supports 
-\change_inserted 2047637253 1475533187
-SVG 
-\change_inserted 227574939 1473131628
-images
-\change_inserted 2047637253 1475533525
+figure This experimental template supports vector graphics (SVG) images
  that contain text written in \SpecialChar LaTeX
 .
-
-\change_inserted 227574939 1473131628
- 
-\change_inserted 2047637253 1475533551
-It relies on the PDF/PS+\SpecialChar LaTeX
- option of 
-\change_deleted 2047637253 1475533556
-created with 
-\change_inserted 227574939 1473131628
-the program 
-\begin_inset CommandInset href
-LatexCommand href
-name "Inkscape"
-target "https://en.wikipedia.org/wiki/Inkscape";
+ It relies on the option 
+\family sans
+Omit text in PDF and create LaTeX file
+\family default
+ when saving a drawing as PDF with the program 
+\noun on
+Inkscape
+\noun default
+, 
+\begin_inset CommandInset citation
+LatexCommand cite
+key "Inkscape"
 literal "false"
 
 \end_inset
 
 .
- 
-\change_inserted 2047637253 1475534005
-As described by the CTAN demonstration package 
-\emph on
-svg-inkscape
-\emph default
-,
-\end_layout
-
-\begin_deeper
-\begin_layout Quote
-
-\change_inserted 2047637253 1475534064
-
-\emph on
-using the 
-\begin_inset Quotes eld
-\end_inset
-
-PDF+\SpecialChar LaTeX
- output
-\begin_inset Quotes erd
+ This allows to include SVG documents in which \SpecialChar LaTeX
+ will typeset the text.
+ The benefit of such SVGs is a uniform text style throughout the whole 
document.
+\begin_inset Newline newline
 \end_inset
 
- option of Inkscape, it is possible to include SVG in documents, in which
- \SpecialChar LaTeX
- typesets the text.
- This results in uniform text style throughout the document, including text
- in images; moreover, \SpecialChar LaTeX
- commands may be used in the image’s text, providing
- such things as mathematics and references.
-\end_layout
-
-\begin_layout Standard
-
-\change_inserted 2047637253 1475534692
-With Inkscape, even the size of the font is taken from the surrounding 
\SpecialChar LaTeX
-
- document.
- Of course, you can always embed \SpecialChar LaTeX
- modifiers like 
-\family typewriter
+One can use \SpecialChar TeX
+ code commands like 
+\series bold
 
 \backslash
 Large
-\family default
+\series default
 , 
-\family typewriter
+\series bold
 
 \backslash
 small
-\family default
+\series default
 , etc.
- into your figure text strings.
- Refer to the 
-\emph on
-svg-inkscape
-\emph default
- documentation package for more information and examples.
-\end_layout
-
-\begin_layout Standard
-
-\change_inserted 2047637253 1475534902
-It should be noted that while the image takes into account the surrounding
- font, its preview in \SpecialChar LyX
- does not.
- Wrapping the external inset in a preview inset gives better results in
- this regard.
-\e

[LyX/master] inkscape.xtemplate: fixes issues 3, 6 and 7 of bug #10679

[Uwe Stöhr]

commit 9bc931f28ea88efdcaa02b9a55f4920a2109f5b7
Author: Uwe Stöhr 
Date:   Sun May 21 23:57:53 2017 +0200

inkscape.xtemplate: fixes issues 3, 6 and 7 of bug #10679
---
 lib/xtemplates/inkscape.xtemplate |   13 +
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/xtemplates/inkscape.xtemplate 
b/lib/xtemplates/inkscape.xtemplate
index 840d126..ba6b553 100644
--- a/lib/xtemplates/inkscape.xtemplate
+++ b/lib/xtemplates/inkscape.xtemplate
@@ -5,7 +5,6 @@
 # Licence details can be found in the file COPYING.
 #
 # author Asger Alstrup Nielsen
-# author Angus Leeming
 # author Johnathan Burchill
 #
 # Full author contact details are available in file CREDITS.
@@ -34,15 +33,11 @@ Template Inkscape
GuiName "Inkscape figure"
HelpText
An Inkscape figure.
-   This template should work flawlessly with Inkscape 0.48. 
-   For Inkscape 0.91, there is a (reported) bug in the 
-   LaTeX + PDF output which makes a workaround necessary, 
-   see Embedded Objects manual.
Note that using this template automatically uses the 
document text in the image (like with the Xfig template).
HelpTextEnd
InputFormat svg
-   FileFilter "*.svg"
+   FileFilter "*.{svg}"
AutomaticProduction true
Transform Rotate
Preview InstantPreview
@@ -52,8 +47,9 @@ Template Inkscape
Product 
"$$RotateFront\\input{$$AbsOrRelPathMaster$$Basename.pdf_tex}$$RotateBack"
UpdateFormat pdftex
UpdateResult "$$AbsPath$$Basename.pdf_tex"
-   Requirement "color"
+   Requirement "xcolor"
Requirement "graphicx"
+   Requirement "mathtools"
# Preamble WarnNotFound
# Preamble InputOrWarn
ReferencedFile pdflatex "$$AbsOrRelPathMaster$$Basename.pdf_tex"
@@ -64,8 +60,9 @@ Template Inkscape
Product 
"$$RotateFront\\input{$$AbsOrRelPathMaster$$Basename.eps_tex}$$RotateBack"
UpdateFormat pstex
UpdateResult "$$AbsPath$$Basename.eps_tex"
-   Requirement "color"
+   Requirement "xcolor"
Requirement "graphicx"
+   Requirement "mathtools"
# Preamble WarnNotFound
# Preamble InputOrWarn
ReferencedFile latex "$$AbsOrRelPathMaster$$Basename.eps_tex"

[LyX/master] Math.lyx: describe new math features

[Uwe Stöhr]

commit 958814ca2827e1644aedcd982653e706f545651c
Author: Uwe Stöhr 
Date:   Mon May 22 01:48:07 2017 +0200

Math.lyx: describe new math features
---
 lib/doc/Changelog-Math-LyX_22.txt |   29 -
 lib/doc/Changelog-Math-LyX_23.txt |   37 +++
 lib/doc/Math.lyx  |   98 +++---
 lib/doc/de/Math.lyx   |   96 ++
 lib/doc/es/Math.lyx   |   93 ++---
 lib/doc/fr/Math.lyx   |  118 +
 lib/doc/ja/Math.lyx   |  119 ++---
 7 files changed, 181 insertions(+), 409 deletions(-)

diff --git a/lib/doc/Changelog-Math-LyX_22.txt 
b/lib/doc/Changelog-Math-LyX_22.txt
deleted file mode 100644
index daaf488..000
--- a/lib/doc/Changelog-Math-LyX_22.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-For LyX 2.2.3:
-
-- sec. 17: (not French) new sentence
-
-
-For LyX 2.2.1:
-
-- sec. 11: (Japanese only) new table row with shortcuts
-- 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
-
-
-In the second step:
-
-Modified:
-
-- sec. 19.3: revised and new descriptiion of a feature
diff --git a/lib/doc/Changelog-Math-LyX_23.txt 
b/lib/doc/Changelog-Math-LyX_23.txt
new file mode 100644
index 000..cb73989
--- /dev/null
+++ b/lib/doc/Changelog-Math-LyX_23.txt
@@ -0,0 +1,37 @@
+For LyX 2.3.0:
+
+Modified:
+
+first step:
+- sec. 17: completely rewritten
+
+
+For LyX 2.2.3:
+
+- sec. 17: (not French) new sentence
+
+
+For LyX 2.2.1:
+
+- sec. 11: (Japanese only) new table row with shortcuts
+- 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
+
+
+In the second step:
+
+Modified:
+
+- sec. 19.3: revised and new descriptiion of a feature
diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 18509ec..ecf876f 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 541
+\lyxformat 543
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -204,7 +204,9 @@
 \paragraph_separation skip
 \defskip medskip
 \is_math_indent 0
+\math_numbering_side default
 \quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 2
 \paperpagestyle plain
@@ -27544,26 +27546,22 @@ There are two different alignment styles:
 
 \begin_deeper
 \begin_layout Description
-Centered is the predefined standard
+Centered is the predefined standard.
 \end_layout
 
 \begin_layout Description
-Indented for this the option 
-\series bold
-fleqn
-\series default
- must be inserted in the menu 
+Indented this can be set using the menu 
 \family sans
 Document\SpecialChar menuseparator
 Settings
 \family default
  under 
 \family sans
-Document
+Math
 \begin_inset space ~
 \end_inset
 
-Class
+Options.
 \end_layout
 
 \begin_layout Standard
@@ -27571,91 +27569,38 @@ When
 \series bold
 Indented
 \series default
- is used, the indentation can be adjusted with the length 
-\series bold
-
-\backslash
-mathindent
-\series default
-
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Commands ! M ! 
-\backslash
-mathindent
-\end_layout
-
-\end_inset
-
-.
- Should the distance be 15
-\begin_inset space \thinspace{}
-\end_inset
-
-mm, the following command line is inserted in the \SpecialChar LaTeX
--preamble
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-setlength{
-\backslash
-mathindent}{15mm}
-\end_layout
-
-\begin_layout Standard
-When no length is specified, a predefined value will be used.
- The value depends on the used document class.
+ is used, the indentation can be adjusted.
+ The default value depends on the used document class.
 \end_layout
 
 \end_deeper
 \begin_layout Itemize
-And two different numbering styles:
-\end_layout
-
-\begin_deeper
-\begin_layout Description
-Right is the predefined standard
-\end_layout
-
-\begin_layout Description
-Left for this the option 
-\series bold
-leqno
-\series default
- must be inserted in the menu 
+And two different numbering styles that can be set in the menu 
 \family sans
 Document\SpecialChar menuseparator
 Settings
 \family default
  under 
 \family sans
-Document
+Math
 \begin_inset space ~
 \end_inset
 
-Class
+Options
+\family default
+:
 \end_layout
 
-\end_deeper
-\begin_layout Standard
+\begin_deeper
+\begin_layout Description
+Right is in most cases the default.
+\end_layout
 
-\series bold
-fleqn
-\series default
- and 
-\series bold
-leqno
-\series default
- can also be used together.
- In this case both

[LyX/master] pt_BR.po: updates for 2.3 from Georger

[Uwe Stöhr]

commit a425b37dd2662474a12e857c8bc07795434ced55
Author: Uwe Stöhr 
Date:   Fri Jul 21 02:28:33 2017 +0200

pt_BR.po: updates for 2.3 from Georger

 po/pt_BR.po | 1523 +--
 1 files changed, 739 insertions(+), 784 deletions(-)

[LyX/master] Win installer: prepare for a new 2.3 release (hopefully a beta)

[Uwe Stöhr]

commit 52025d5c9b5857ae9a0df67d78cd75f8e955e288
Author: Uwe Stöhr 
Date:   Tue Jul 25 00:31:45 2017 +0200

Win installer: prepare for a new 2.3 release (hopefully a beta)
---
 .../Win32/packaging/installer/ChangeLog.txt|9 -
 development/Win32/packaging/installer/settings.nsh |6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/development/Win32/packaging/installer/ChangeLog.txt 
b/development/Win32/packaging/installer/ChangeLog.txt
index 1e56edf..d7836a3 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,11 @@
-Changelog for LyX-230-alpha1:
+Changelog for LyX-230-alpha2:
+- installs LyX 2.3.0 alpha2
+- updated to MiKTeX 2.9 build 6361
+- updated to ImageMagick 7.0.6-2
+- updated to Perl 5.24.2.1
+
+
+Changelog for LyX-230-alpha1:
 - installs LyX 2.3.0 alpha1
 - updated to MiKTeX 2.9 build 6236
   (fixes potential problems with the installation of LaTeX packages)
diff --git a/development/Win32/packaging/installer/settings.nsh 
b/development/Win32/packaging/installer/settings.nsh
index 05ce02d..7bf3ee8 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -12,7 +12,7 @@ These typically need to be modified for each LyX release
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 3
 !define APP_VERSION_REVISION 0
-!define APP_VERSION_EMERGENCY "alpha-1" # use "1" for an emergency release of 
LyX otherwise ""
+!define APP_VERSION_EMERGENCY "alpha-2" # use "1" 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
 
@@ -51,12 +51,12 @@ These typically need to be modified for each LyX release
 !define MiKTeXRepo 
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/";
 
 !define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "7.0.5"
+!define ImageMagickVersion "7.0.6"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
  !define JabRefInstall "external\JabRef_windows_3_8_2.exe"
  !define SIZE_JABREF 36831 # size in KB 
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6236.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6361.exe"
 !endif
 

[LyX/2.2.x] Win installer: prepare for a new 2.2.4 release

[Uwe Stöhr]

commit ef5ff9f43e6b85badea925aad64ffad4da6f0d72
Author: Uwe Stöhr 
Date:   Tue Jul 25 00:33:04 2017 +0200

Win installer: prepare for a new 2.2.4 release
---
 .../Win32/packaging/installer/ChangeLog.txt|   13 ++---
 development/Win32/packaging/installer/settings.nsh |7 +++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/development/Win32/packaging/installer/ChangeLog.txt 
b/development/Win32/packaging/installer/ChangeLog.txt
index cd11823..08714b7 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,8 +1,15 @@
-Changelog for LyX-223-1:
+Changelog for LyX-224-1:
+- installs LyX 2.2.4
+- updated to MiKTeX 2.9 build 6361
+- updated to ImageMagick 7.0.6-2
+- updated to Perl 5.24.2.1
+
+
+Changelog for LyX-223-1:
 - installs LyX 2.2.3
-- updated to MiKTeX 2.9 build 6236
+- updated to MiKTeX 2.9 build 6326
   (fixes potential problems with the installation of LaTeX packages)
-- updated to ImageMagick 7.0.5-4
+- updated to ImageMagick 7.0.5-5
 - updated to JabRef 3.8.2
 - updated to NSIS 3.0.1
 - updated to Ghostscript 9.21
diff --git a/development/Win32/packaging/installer/settings.nsh 
b/development/Win32/packaging/installer/settings.nsh
index 549331e..80eb49d 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,7 +11,7 @@ These typically need to be modified for each LyX release
 
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 2
-!define APP_VERSION_REVISION 3
+!define APP_VERSION_REVISION 4
 !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_VERSION_BUILD 1 # Start with 1 for the installer releases of each 
version
@@ -51,12 +51,11 @@ These typically need to be modified for each LyX release
 !define MiKTeXRepo 
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/";
 
 !define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "7.0.5"
+!define ImageMagickVersion "7.0.6"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
  !define JabRefInstall "external\JabRef_windows_3_8_2.exe"
  !define SIZE_JABREF 36831 # size in KB 
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6236.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6361.exe"
 !endif
-

[LyX/master] correct a typo in filename

[Uwe Stöhr]

commit bc6214b63bf9c1b4680c8b4ed9a08c3328878940
Author: Uwe Stöhr 
Date:   Wed Jul 26 01:09:39 2017 +0200

correct a typo in filename
---
 lib/doc/docUpadatesFor23.txt |  100 --
 lib/doc/docUpdatesFor23.txt  |  100 ++
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/lib/doc/docUpadatesFor23.txt b/lib/doc/docUpadatesFor23.txt
deleted file mode 100644
index b9a2abb..000
--- a/lib/doc/docUpadatesFor23.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-Hereafter are the chnges in the docs for 2.3
-
-1--- UserGuide.lyx
-
-* Section 3.9.3.2: Quote->Quotation marks
-   edition of old sections
-  new stuff
-
-* Section 3.9.5: capitalize logos
-
-* Section 6.1: item 'Formatted reference', additional stuff
-   item 'Label only', new stuff
-  new note at end of section
-
-* Section 6.5: additional info about the use of databases
-
-* Section 6.5.1: add crossref to title
- pĥrase added to first paragraph
-paragraph added on natbib use
-
-* Section 6.5.2: remove BiBTeX in title
- change word in first paragraph
-add info about biblatex
-edit content as section 6.5.2.1 BibTeX
-add section 6.5.2.2 Biblatex
- add section 6.5.2.3 Processors
-  from previous info
-add section 6.5.2.4 Customizing
-section 6.5.3 completely rewritten
-
-* Section 6.8: add info about inverted branches
-
-* Section B.12: edit info to add biblatex features
-
-* Section C.1.2.3: add info about tab closing
-
-* Bibliography: add entry about Biblatex
-
-
-2---  Additional.lyx
-
-* Section 3.1: introduce Biblatex
-
-* Section 3.1.1: introduce Biblatex
-
-* Section 3.1.2: rename title as 'Subdivided bibliographies'
- and introduce Biblatex
-
-* Section 3.1.3: rewrite almost completely
-
-3--- Customization.lyx
-
-Section 2.1.2: new citeengines item
-   new xtemplates item
-
-Section 2.1.4: remove external_templates item
-
-Section 5.2.6: new section (Cite engine files)
-
-Section 5.3.3: new section (Cite engine file decalration)
-
-Section 5.3.4->5: new CiteEngine item
-  new CiteFramework item
- new MaxCiteNames item
- new OutlinerName item
-
-Section 5.3.6->7: inside Argument item
-  new AddToToc
-  new PassThru
-  new IsTocCaption
-new IsTocCaption item
-   new ResumeCounter item
-   new StepMasterCounter item
-
-Section 5.3.9->10:  new AddToToc item
-edit InToc item
-   new IsTocCaption item
-
-Section 5.3.12->13: new section (Citation engine description)
-
-Section 5.3.13->14: add CiteFormat item syntax
-   add use instructions (2nd par.)
-  new paragraph about special keys
-  new paragraph about author lists
-  word citation added (translatable text)
-  phrase about cittengines (id.)
-  
-
-Section 6.2: 3rd paragraph, introduce xtemplate files
-
-4--- EmbeddedObjects.lyx
-
-Section 8: 1st paragraph add minted
-   4th paragraph add example listing
-   5th paragraph add note and remove previous example
-  8th paragraph edited
-  last paragrpah edited
-
-Biblography: add reference to minted package
-
diff --git a/lib/doc/docUpdatesFor23.txt b/lib/doc/docUpdatesFor23.txt
new file mode 100644
index 000..b9a2abb
--- /dev/null
+++ b/lib/doc/docUpdatesFor23.txt
@@ -0,0 +1,100 @@
+Hereafter are the chnges in the docs for 2.3
+
+1--- UserGuide.lyx
+
+* Section 3.9.3.2: Quote->Quotation marks
+   edition of old sections
+  new stuff
+
+* Section 3.9.5: capitalize logos
+
+* Section 6.1: item 'Formatted reference', additional stuff
+   item 'Label only', new stuff
+  new note at end of section
+
+* Section 6.5: additional info about the use of databases
+
+* Section 6.5.1: add crossref to title
+ pĥrase added to first paragraph
+paragraph added on natbib use
+
+* Section 6.5.2: remove BiBTeX in title
+ change word in first paragraph
+add info about biblatex
+edit content as section 6.5.2.1 BibTeX
+add section 6.5.2.2 Biblatex
+ add section 6.5.2.3 Processors
+  from previous info
+add section 6.5.2.4 Customizing
+section 6.5.3 completely rewritten
+
+* Section 6.8: add info about inverted branches
+
+* Section B.12: edit info to

[LyX/master] EmbeddedObjects.lyx: accept info for minted support

[Uwe Stöhr]

commit a42c4915857bf2b3ca5458535efb38ce0d5f5ad1
Author: Uwe Stöhr 
Date:   Wed Jul 26 01:11:08 2017 +0200

EmbeddedObjects.lyx: accept info for minted support

- see my mail to the devel list for open issues with this
- transfer this info to the other languages
---
 lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt |1 +
 lib/doc/EmbeddedObjects.lyx   |  268 -
 lib/doc/de/EmbeddedObjects.lyx|  164 ++-
 lib/doc/es/EmbeddedObjects.lyx|  167 +++-
 lib/doc/fr/EmbeddedObjects.lyx|  163 +++-
 lib/doc/ja/EmbeddedObjects.lyx|  168 +++-
 6 files changed, 724 insertions(+), 207 deletions(-)

diff --git a/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt 
b/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt
index a0b2c49..8a5763e 100644
--- a/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt
+++ b/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt
@@ -6,6 +6,7 @@ first step:
 - sec. 1.2: changed image captions and labels
 - sec. 3.4.1: new paragraphs
 - sec. 7.1: new description item for Inkscape drawings
+- sec. 8: new support for the LaTeX package minted
 - bibliography: new entry for Inkscape
 
 
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index c46d722..57deaaa 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -233,12 +233,11 @@ graphicboxes
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
-\author 5863344 "ef"
 \end_header
 
 \begin_body
@@ -40851,11 +40850,7 @@ Program Listing
 \family default
 .
  The \SpecialChar LaTeX
--package
-\change_inserted 5863344 1497177967
-s
-\change_unchanged
- 
+-packages 
 \series bold
 listings
 \series default
@@ -40870,9 +40865,7 @@ status collapsed
 
 \end_inset
 
- 
-\change_inserted 5863344 1497177997
-or 
+ or 
 \series bold
 minted
 \series default
@@ -40881,36 +40874,44 @@ minted
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted 5863344 1497178009
 \SpecialChar LaTeX
 -packages ! minted
 \end_layout
 
 \end_inset
 
+ provide a powerful and flexible way to insert program source code into
+ your document.
+ One can only use one of these packages in a document.
  
-\change_unchanged
-provide
-\change_deleted 5863344 1497178016
-s
-\change_unchanged
- a powerful and flexible way to insert program source code into your document.
-
-\change_inserted 5863344 1497280755
- You can use either one in a document, but listings is used by default.
- In order to use minted, you need to select it as the syntax highlighting
- package in Document\SpecialChar menuseparator
-Settings\SpecialChar menuseparator
-Listings.
- However, note that minted requires additional software (the pygments python
- module) and the 
+\series bold
+listings
+\series default
+ is used by default.
+ In order to use 
+\series bold
+minted
+\series default
+, you need to select it as the syntax highlighting package in the document
+ settings under 
+\family sans
+Listings
+\family default
+.
+ Note that 
+\series bold
+minted
+\series default
+ requires additional software (the 
+\family sans
+pygments
+\family default
+ python module) and the 
 \family typewriter
 -shell-escape
 \family default
- option for the latex backend, which allows arbitrary code execution.
-\change_unchanged
-
+ option for the \SpecialChar LaTeX
+ backend.
 \end_layout
 
 \begin_layout Standard
@@ -41045,71 +41046,10 @@ Float
 \family default
  option in this case as also non-float listings can have captions and be
  referenced.
-\change_inserted 5863344 1497179331
-
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted 5863344 1497179333
-\begin_inset listings
-lstparams "language=Python"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-\change_inserted 5863344 1497179333
-
-\begin_inset Caption Standard
-
-\begin_layout Plain Layout
-
-\change_inserted 5863344 1497179333
-\begin_inset CommandInset label
-LatexCommand label
-name "lst:Example-Listing"
-
-\end_inset
-
-Example Listing float
-\end_layout
-
-\end_inset
-
-# Example listing float
-\end_layout
-
-\begin_layout Plain Layout
-
-\change_inserted 5863344 1497179333
-
-def func(param):
-\end_layout
-
-\begin_layout Plain Layout
-
-\change_inserted 5863344 1497179333
-
-'this is a python function'
-\end_layout
-
-\begin_layout Plain Layout
-
-\change_inserted 5863344 1497179333
-
-pass
-\end_layout
-
-\end_inset
-
-
-\change_unchanged
-
-\end_layout
-
-\begin_layout Standard
-You can add captions to listings with the menu 
+You can add captions to listings that are not inline with the menu 
 \family sans
 Insert\SpecialChar menuseparator
 Caption
@@ -41144,61 +41084,9 @@ List of Listings
 \family default
 .
  The list entries are the listing caption a

[LyX/2.2.x] status.22x: move crash fixes up

[Uwe Stöhr]

commit 8f476415ea77370df78d4da1c773ac6b26817ca3
Author: Uwe Stöhr 
Date:   Wed Jul 26 01:32:36 2017 +0200

status.22x: move crash fixes up

- also correct a bug number
---
 status.22x |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/status.22x b/status.22x
index 3589c13..2cfd328 100644
--- a/status.22x
+++ b/status.22x
@@ -73,6 +73,12 @@ What's new
 
 - Fix crash when closing master document with dirty child while Document
   Settings dialog is open (bug 9979).
+  
+- Fix random crash when dissolving inset (bug 10667).
+
+- Fix potential crash when cursor enters an inset (bug 10691).
+
+- Avoid crash when selecting long text (bug 10324).
 
 - Remove duplicate entries from the Symbols dialog (bug 10644).
 
@@ -93,17 +99,11 @@ What's new
 
 - Fix cursor state after double/triple click in mathed (bug #10686).
 
-- Fix potential crash when cursor enters an inset (bug 10691).
-
-- Fix random crash when dissolving inset (bug 10667).
-
-- Avoid crash when selecting long text (bug 10324).
-
 - Avoid a case of stuck cursor after entering an inset (bug 10630).
 
 - Don't swallow labels not entered through the toolbar in mathed (bug 10546).
 
-- Fix bad context menu on insets that do not have one (bug 10626).
+- Fix bad context menu on insets that do not have one (bug 10616).
 
 
 * INTERNALS

[LyX/master] Win installer: add necessary LaTeX packages for minted

[Uwe Stöhr]

commit 49b83acf12f1f12950e4e75e8c2c97259a412108
Author: Uwe Stöhr 
Date:   Wed Jul 26 23:02:20 2017 +0200

Win installer: add necessary LaTeX packages for minted
---
 development/Win32/packaging/installer/Packages.txt |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/development/Win32/packaging/installer/Packages.txt 
b/development/Win32/packaging/installer/Packages.txt
index 9df101b..80e3757 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -266,4 +266,7 @@ datetime2-german
 tracklang
 acrotex
 zhmetrics
-conv-xkv
\ No newline at end of file
+conv-xkv
+minted
+fvextra
+xstring
\ No newline at end of file

[LyX/master] UserGuide: take care of the new reference format features

[Uwe Stöhr]

commit 00ae46489ee1d0f05f431694e2000987633f8785
Author: Uwe Stöhr 
Date:   Wed Jul 26 23:43:35 2017 +0200

UserGuide: take care of the new reference format features

- also: as we recommend refstyle in the text the document should also use it
---
 lib/doc/Changelog-UserGuide-LyX_22x.txt |   49 
 lib/doc/Changelog-UserGuide-LyX_23x.txt |   57 ++
 lib/doc/UserGuide.lyx   |  187 ---
 lib/doc/de/UserGuide.lyx|  126 ++---
 lib/doc/es/UserGuide.lyx|  149 +++-
 lib/doc/fr/UserGuide.lyx|  171 +++--
 lib/doc/ja/UserGuide.lyx|  139 ++-
 7 files changed, 584 insertions(+), 294 deletions(-)

diff --git a/lib/doc/Changelog-UserGuide-LyX_22x.txt 
b/lib/doc/Changelog-UserGuide-LyX_22x.txt
deleted file mode 100644
index 33816f6..000
--- a/lib/doc/Changelog-UserGuide-LyX_22x.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-For LyX 2.2.3:
-
-- sec. 2.5.1: (not French) new sentence
-- sec. 6.11.4: Japanese only: untranslated note
-- sec. 6.10.1: (not French) new footnote
-- sec. B.20: (not French) section was renamed
-
-- Shortcuts.lyx: Spanish only: untranslated sentence
-
-
-For LyX 2.2.1:
-
-- sec. 6.11: new sentence
-- sec. B.20: new item
-
-
-For LyX 2.2.0:
-
-in the first step:
-- sec. 3.3.10.1 (Japanese only) changed sentence
-- sec. 3.3.10.2 new paragraph about Verbatim*
-- sec. 3.4.6: changed paragraph
-- sec. 3.7.6: new color names
-- sec. 6.7.1: new paragraph
-- sec. A.6.10: new sentence
-- sec. B.9: (Japanese only) changed sentence
-- sec. C.1.2.2: info about compression
-- Bibliography: (Japanese only) new entry for the makeindex manpages
-
-in the second step:
-- sec. 2.5.2: new section
-- sec. 3.4.6: updated description
-- sec. 3.9.5: (French and Japanese only) updated menu name
-- sec. A.1.13: new formats OpenDocument (Pandoc), OpenDocument (tex4ht) and MS 
Word Office Open XML
-   new reference for Postscript
-- sec. A.4.2: new entry
-- sec. A.6.2: new paragraph
-- sec. A.6.11: new section
-- sec. C.2.3: new option
-- sec. C.6.1: new dvips option
-
-in the third step:
- the term "longtable" was replaced by "multi-page table"
-  please rename all occurrences (including the cross-references and the index
-  entries)of longtable accordingly
-  occurrences: sec. 4.5.2, A.4.14
-- sec. A.2.10: revised
-- sec. A.2.11: new subsection
-- sec. A.2.12: revised
diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt 
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
new file mode 100644
index 000..fa5dfb1
--- /dev/null
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -0,0 +1,57 @@
+For LyX 2.3.0:
+
+Modified:
+
+first step:
+- sec. 6.1: new reference format and new options
+
+
+For LyX 2.2.3:
+
+- sec. 2.5.1: (not French) new sentence
+- sec. 6.11.4: Japanese only: untranslated note
+- sec. 6.10.1: (not French) new footnote
+- sec. B.20: (not French) section was renamed
+
+- Shortcuts.lyx: Spanish only: untranslated sentence
+
+
+For LyX 2.2.1:
+
+- sec. 6.11: new sentence
+- sec. B.20: new item
+
+
+For LyX 2.2.0:
+
+in the first step:
+- sec. 3.3.10.1 (Japanese only) changed sentence
+- sec. 3.3.10.2 new paragraph about Verbatim*
+- sec. 3.4.6: changed paragraph
+- sec. 3.7.6: new color names
+- sec. 6.7.1: new paragraph
+- sec. A.6.10: new sentence
+- sec. B.9: (Japanese only) changed sentence
+- sec. C.1.2.2: info about compression
+- Bibliography: (Japanese only) new entry for the makeindex manpages
+
+in the second step:
+- sec. 2.5.2: new section
+- sec. 3.4.6: updated description
+- sec. 3.9.5: (French and Japanese only) updated menu name
+- sec. A.1.13: new formats OpenDocument (Pandoc), OpenDocument (tex4ht) and MS 
Word Office Open XML
+   new reference for Postscript
+- sec. A.4.2: new entry
+- sec. A.6.2: new paragraph
+- sec. A.6.11: new section
+- sec. C.2.3: new option
+- sec. C.6.1: new dvips option
+
+in the third step:
+ the term "longtable" was replaced by "multi-page table"
+  please rename all occurrences (including the cross-references and the index
+  entries)of longtable accordingly
+  occurrences: sec. 4.5.2, A.4.14
+- sec. A.2.10: revised
+- sec. A.2.11: new subsection
+- sec. A.2.12: revised
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 67db459..ef36d36 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -112,7 +112,7 @@ enumitem
 \paperorientation portrait
 \suppress_date false
 \justification true
-\use_refstyle 0
+\use_refstyle 1
 \use_minted 0
 \notefontcolor #ff
 \branch Question
@@ -27314,7 +27314,7 @@ reference "subsec:Protected-Space"
 \end_layout
 
 \begin_layout Standard
-There are six formats of cross-references:
+There are eight formats of cross-references:
 \end_layout
 
 \begin_layout Description
@@ -27546,19 +27546,11 @@ fig
 \begin_inset Quotes erd
 \end_inset
 
-) 

[LyX/master] UserGuide.lyx: accept and distribute some more additions

[Uwe Stöhr]

commit 964fb09bafabbdd531c4ac28c20c088ee25e811e
Author: Uwe Stöhr 
Date:   Thu Jul 27 00:03:33 2017 +0200

UserGuide.lyx: accept and distribute some more additions
---
 lib/doc/Changelog-UserGuide-LyX_23x.txt |1 +
 lib/doc/UserGuide.lyx   |  107 +++---
 lib/doc/de/UserGuide.lyx|   20 +-
 lib/doc/es/UserGuide.lyx|   87 +
 lib/doc/fr/UserGuide.lyx|   92 +--
 lib/doc/ja/UserGuide.lyx|   73 ++---
 6 files changed, 250 insertions(+), 130 deletions(-)

diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt 
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index fa5dfb1..6778a21 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -4,6 +4,7 @@ Modified:
 
 first step:
 - sec. 6.1: new reference format and new options
+- sec. C.1.2.3 new sentence
 
 
 For LyX 2.2.3:
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index ef36d36..ba1f99f 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -146,7 +146,6 @@ enumitem
 \html_css_as_file 0
 \html_be_strict true
 \author -712698321 "Jürgen Spitzmüller"
-\author 274215730 "scott"
 \author 424524441 "rgheck"
 \end_header
 
@@ -28270,41 +28269,8 @@ name "sec:Bibliography"
 
 \begin_layout Standard
 There are two ways of generating the bibliography in a \SpecialChar LyX
-
-\change_inserted -712698321 1483880152
- 
-\change_deleted -712698321 1483880151
--
-\change_unchanged
-document.
- You can include a bibliography database,
-\change_deleted -712698321 1483880276
-
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Known under the name 
-\begin_inset Quotes eld
-\end_inset
-
-Bib\SpecialChar TeX
- database
-\begin_inset Quotes erd
-\end_inset
-
-.
-\end_layout
-
-\end_inset
-
-
-\change_unchanged
- which is explained in 
-\change_deleted -712698321 1483883190
-the next subsection
-\change_inserted -712698321 1483890955
-sec.
+ document.
+ You can include a bibliography database, which is explained in sec.
 \begin_inset space ~
 \end_inset
 
@@ -28318,28 +28284,12 @@ noprefix "false"
 
 \end_inset
 
-
-\change_unchanged
 , or you can insert the bibliography manually, using the paragraph environment
  
 \family sans
 Bibliography
 \family default
-, which 
-\change_deleted -712698321 1483883190
-wa
-\change_inserted -712698321 1483883190
-i
-\change_unchanged
-s described in 
-\change_inserted -712698321 1483883197
-the following 
-\change_unchanged
-section
-\change_inserted -712698321 1483890942
- (but see also sec.
-\change_unchanged
-
+, which is described in the following section (but see also sec.
 \begin_inset space ~
 \end_inset
 
@@ -28350,11 +28300,7 @@ reference "subsec:Biblio_environment"
 
 \end_inset
 
-
-\change_inserted -712698321 1483883212
-)
-\change_unchanged
-.
+).
  If you want anything other than the numerical citations that are used in
  this document, 
 \change_deleted -712698321 1483883190
@@ -28405,8 +28351,7 @@ Bibliography
 \end_layout
 
 \begin_layout Subsection
-
-\change_inserted -712698321 1483885645
+The Bibliography Environment
 \begin_inset CommandInset label
 LatexCommand label
 name "subsec:The-Bibliography-Environment"
@@ -28414,8 +28359,6 @@ name "subsec:The-Bibliography-Environment"
 \end_inset
 
 
-\change_unchanged
-The Bibliography Environment
 \end_layout
 
 \begin_layout Standard
@@ -29120,7 +29063,7 @@ Inserting a citation reference works as described in 
section
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "subsec:The-Bibliography-Environment"
+reference "subsec:The-Bibliography-Environmentfg"
 plural "false"
 caps "false"
 noprefix "false"
@@ -29641,7 +29584,7 @@ Natbib
  
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "subsec:The-Bibliography-Environment"
+reference "subsec:The-Bibliography-Environmentfg"
 
 \end_inset
 
@@ -46130,12 +46073,8 @@ arg   "closetab"
 \family default
 ) at the right side of the tab bar to close tabs.
  Otherwise every document tab has its own close button.
-
-\change_inserted 274215730 1469338548
- Regardless of this option, one may always close a tab by middle-clicking
+ Regardless of this option, one can always close a tab by middle-clicking
  it in the tab bar.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Standard
@@ -49551,13 +49490,9 @@ 
http://www.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf
 \end_inset
 
 
-\change_inserted -712698321 1483884806
-
 \end_layout
 
 \begin_layout Bibliography
-
-\change_inserted -712698321 1483884882
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
 key "Biblatex"
@@ -49574,11 +49509,23 @@ literal "false"
 
 \end_inset
 
- of the 
-\family sans
-Biblatex
-\family defaul

[LyX/master] EmbeddedObjects.lyx: finish the description of the minted support

[Uwe Stöhr]

commit 39e467a2000c826f7a932105c24ebf1cec70270a
Author: Uwe Stöhr 
Date:   Thu Jul 27 01:15:42 2017 +0200

EmbeddedObjects.lyx: finish the description of the minted support
---
 lib/doc/EmbeddedObjects.lyx|  180 --
 lib/doc/de/EmbeddedObjects.lyx |  178 +++--
 lib/doc/es/EmbeddedObjects.lyx |  192 ++--
 lib/doc/fr/EmbeddedObjects.lyx |  214 ++--
 lib/doc/ja/EmbeddedObjects.lyx |  188 +--
 5 files changed, 905 insertions(+), 47 deletions(-)

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 57deaaa..f057671 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -21519,7 +21519,7 @@ array
 \series default
  will be loaded automatically by \SpecialChar LyX
  when you use self defined table formats.
- To avoid that it being loaded twice the command 
+ To avoid that it is loaded twice the command 
 \series bold
 
 \backslash
@@ -40888,7 +40888,10 @@ status collapsed
 listings
 \series default
  is used by default.
- In order to use 
+\end_layout
+
+\begin_layout Standard
+In order to use 
 \series bold
 minted
 \series default
@@ -40898,20 +40901,129 @@ minted
 Listings
 \family default
 .
- Note that 
+ 
 \series bold
 minted
 \series default
- requires additional software (the 
+ requires also additionally the module 
 \family sans
 pygments
 \family default
- python module) and the 
+ of the software 
+\noun on
+Python
+\noun default
+
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Under \SpecialChar LyX
+ for Windows 
+\family sans
+pygments
+\family default
+ is already installed.
+\end_layout
+
+\end_inset
+
+ and the option 
 \family typewriter
 -shell-escape
 \family default
- option for the \SpecialChar LaTeX
- backend.
+ for the \SpecialChar LaTeX
+ processor.
+ If you want for example view or export your document as the format 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)
+\family default
+, go to the \SpecialChar LyX
+ preferences and there to the section 
+\family sans
+File
+\begin_inset space ~
+\end_inset
+
+Handling\SpecialChar menuseparator
+Converters
+\family default
+.
+ There go to the entry 
+\family sans
+LaTeX
+\begin_inset space ~
+\end_inset
+
+(pdflatex) -> PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)
+\family default
+ and look at the field 
+\family sans
+Converter
+\family default
+.
+ There you see by default the content
+\begin_inset Newline newline
+\end_inset
+
+
+\series bold
+pdflatex $$i
+\series default
+
+\begin_inset Newline newline
+\end_inset
+
+Now change it to
+\begin_inset Newline newline
+\end_inset
+
+
+\series bold
+pdflatex $$i -shell-escape
+\begin_inset Newline newline
+\end_inset
+
+
+\series default
+and press the 
+\family sans
+Modify
+\family default
+ button and subsequently 
+\family sans
+Apply
+\family default
+ or 
+\family sans
+Save
+\family default
+.
+ The same can be done for the output formats 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(LuaTeX)
+\family default
+ and 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(XeTeX)
+\family default
+.
 \end_layout
 
 \begin_layout Standard
@@ -41084,6 +41196,10 @@ List of Listings
 \family default
 .
  The list entries are the listing caption and the listing number.
+\begin_inset Newpage pagebreak
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -41156,7 +41272,7 @@ minted
  If tit is not floating caption will be typeset before the listing if it
  is inserted to its first line, otherwise it will be typeset after the listing.
  If you want to force the placement in avery case before the listing, you
- have to add the following lines to the preamble:
+ have to add the following lines as last thing to the preamble:
 \begin_inset Newline newline
 \end_inset
 
@@ -41164,13 +41280,59 @@ minted
 \series bold
 
 \backslash
-usepackage{float}
+@ifundefined{newfloat}
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Phantom HPhantom
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\begin_inset space ~
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+{
+\backslash
+usepackage{float}}{}
 \begin_inset Newline newline
 \end_inset
 
 
 \backslash
 floatstyle{plaintop}
+\series default
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+The package 
+\series bold
+float
+\series default
+ will be loaded automatically by \SpecialChar LyX
+ when you use special document-wide float
+ placement settings.
+ To avoid that it is loaded twice the command 
+\series bold
+
+\backslash
+@ifundefined
+\series default
+ is used in the above command.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \end_inset
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 43ffc48..92b1381 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -4113

[LyX/master] UserGuide.lyx: fix broken cross references

[Uwe Stöhr]

commit 726d13f5be45e6489a1816fa0f81a6c7f5d8d41d
Author: Uwe Stöhr 
Date:   Thu Jul 27 01:40:43 2017 +0200

UserGuide.lyx: fix broken cross references
---
 lib/doc/UserGuide.lyx |8 ++--
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index ba1f99f..3980964 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8338,14 +8338,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -8358,7 +8356,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8382,7 +8379,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -29063,7 +29059,7 @@ Inserting a citation reference works as described in 
section
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "subsec:The-Bibliography-Environmentfg"
+reference "subsec:The-Bibliography-Environment"
 plural "false"
 caps "false"
 noprefix "false"
@@ -29584,7 +29580,7 @@ Natbib
  
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "subsec:The-Bibliography-Environmentfg"
+reference "subsec:The-Bibliography-Environment"
 
 \end_inset
 

[LyX/master] EmbeddedObjects.lyx: distribute a note from Richard regarding -shell-escape

[Uwe Stöhr]

commit 87a1ce5f052ac4bf650b692894ca048d6f020904
Author: Uwe Stöhr 
Date:   Sat Jul 29 17:19:24 2017 +0200

EmbeddedObjects.lyx: distribute a note from Richard regarding -shell-escape
---
 lib/doc/EmbeddedObjects.lyx|   16 ++--
 lib/doc/de/EmbeddedObjects.lyx |   30 ++
 lib/doc/es/EmbeddedObjects.lyx |   38 ++
 lib/doc/fr/EmbeddedObjects.lyx |   34 ++
 lib/doc/ja/EmbeddedObjects.lyx |   34 ++
 5 files changed, 142 insertions(+), 10 deletions(-)

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 120c460..61eecb6 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -40895,8 +40895,16 @@ listings
 status open
 
 \begin_layout Plain Layout
-Please note that we do NOT want to encourage users to add -shell-escape
- to converter definitions.
+
+\series bold
+Note:
+\series default
+ \SpecialChar LyX
+ does NOT want to encourage users to add the 
+\family typewriter
+-shell-escape
+\family default
+ option to converter definitions.
  It works, but it is a huge security risk.
  There is an active discussion about how to handle this.
  Once that's been resolved, this can be updated appropriately.
@@ -41217,10 +41225,6 @@ List of Listings
 \family default
 .
  The list entries are the listing caption and the listing number.
-\begin_inset Newpage pagebreak
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 92b1381..31ac7ac 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -41142,6 +41142,31 @@ listings
 \end_layout
 
 \begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Achtung:
+\series default
+ Es wird nicht empfohlen die Option 
+\family typewriter
+-shell-escape
+\family default
+ zu verwenden.
+ Sie funktioniert, ist aber ein großes Sicherheitsproblem.
+ Die \SpecialChar LyX
+-Entwickler diskutieren, wie damit umzugehen ist.
+ Diese Notiz kann erst geändert werden, bis eine Entscheidung getroffen
+ wurde.
+\end_layout
+
+\begin_layout Plain Layout
+=
+\end_layout
+
+\begin_layout Plain Layout
 Um 
 \series bold
 minted
@@ -41283,6 +41308,11 @@ PDF
  gemacht werden.
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Standard
 Ein Rechtsklick auf ein Listing öffnet das Kontextmenü, in dem Sie das 
Ausgabefo
 rmat der Programm-Code-Liste festlegen.
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index b38084a..e5342b1 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -40711,6 +40711,35 @@ listings
 \begin_layout Standard
 
 \lang english
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ \SpecialChar LyX
+ does NOT want to encourage users to add the 
+\family typewriter
+-shell-escape
+\family default
+ option to converter definitions.
+ It works, but it is a huge security risk.
+ There is an active discussion about how to handle this.
+ Once that's been resolved, this can be updated appropriately.
+\end_layout
+
+\begin_layout Plain Layout
+
+\lang english
+=
+\end_layout
+
+\begin_layout Plain Layout
+
+\lang english
 In order to use 
 \series bold
 minted
@@ -40855,6 +40884,11 @@ PDF
 .
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Standard
 Al hacer clic derecho sobre un recuadro de listado se abre el menú contextual
  incorporado en el que puedes configurar su formato.
@@ -41001,10 +41035,6 @@ código
 \family default
  se crea un índice de todos los listados de código con leyenda insertados.
  Las entradas del índice son la leyenda y el número de cada listado de código.
-\begin_inset Newpage pagebreak
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index 1555d78..d0ab6be 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -41859,6 +41859,35 @@ listings
 \begin_layout Standard
 
 \lang english
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ \SpecialChar LyX
+ does NOT want to encourage users to add the 
+\family typewriter
+-shell-escape
+\family default
+ option to converter definitions.
+ It works, but it is a huge security risk.
+ There is an active discussion about how to handle this.
+ Once that's been resolved, this can be updated appropriately.
+\end_layout
+
+\begin_layout Plain Layout
+
+\lang english
+=
+\end_layout
+
+\begin_layout Plain Layout
+
+\lang english
 In order to use 
 \series bold
 minted
@@ -42003,6 +42032,11 @@ PDF
 .
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Standard
 Quand vous cliquez avec le bouton droit sur un insert de li

[LyX/master] UserGuide.lyx: distribute new quotation mark features

[Uwe Stöhr]

commit 147e7f9f610d192e73245197d4448d0d7aadf296
Author: Uwe Stöhr 
Date:   Sat Jul 29 20:43:52 2017 +0200

UserGuide.lyx: distribute new quotation mark features

- there is an issue with the French version, see bug 10736

 lib/doc/Changelog-UserGuide-LyX_23x.txt |1 +
 lib/doc/UserGuide.lyx   |  341 +
 lib/doc/es/UserGuide.lyx|  845 +--
 lib/doc/fr/UserGuide.lyx|  843 ---
 lib/doc/ja/UserGuide.lyx|  796 +++--
 5 files changed, 2341 insertions(+), 485 deletions(-)

[LyX/master] UserGuide.lyx: load math packages automatically

[Uwe Stöhr]

commit 189ed7db3c556e5cd10bde0cf8a78bc0ca5e4057
Author: Uwe Stöhr 
Date:   Sun Jul 30 19:31:57 2017 +0200

UserGuide.lyx: load math packages automatically

this will avoid things like bug #10736
---
 lib/doc/UserGuide.lyx|8 +++---
 lib/doc/es/UserGuide.lyx |   14 ---
 lib/doc/fr/UserGuide.lyx |   58 --
 lib/doc/ja/UserGuide.lyx |   14 ---
 4 files changed, 19 insertions(+), 75 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 68ea95a..05829d2 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -96,14 +96,14 @@ enumitem
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
-\use_package cancel 0
+\use_package cancel 1
 \use_package esint 1
 \use_package mathdots 1
-\use_package mathtools 0
+\use_package mathtools 1
 \use_package mhchem 1
-\use_package stackrel 0
+\use_package stackrel 1
 \use_package stmaryrd 1
-\use_package undertilde 0
+\use_package undertilde 1
 \cite_engine basic
 \cite_engine_type default
 \biblio_style plain
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index afee03d..694e848 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -96,14 +96,14 @@ enumitem
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
-\use_package cancel 0
+\use_package cancel 1
 \use_package esint 1
 \use_package mathdots 1
-\use_package mathtools 0
+\use_package mathtools 1
 \use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
 \cite_engine basic
 \cite_engine_type default
 \biblio_style plain
@@ -8559,14 +8559,12 @@ 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
 
@@ -8579,7 +8577,6 @@ Las dos  líneas siguientes están vacías:
 \end_layout
 
 \begin_layout Verbatim
-
 Casi todo está permitido en entorno Literal:"%&$§#~'`
 \backslash
 }][{|
@@ -8604,7 +8601,6 @@ 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
 
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 210e3b4..f5d27d7 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -109,14 +109,14 @@ logicalmkup
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
-\use_package cancel 0
+\use_package cancel 1
 \use_package esint 1
 \use_package mathdots 1
-\use_package mathtools 0
+\use_package mathtools 1
 \use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
 \cite_engine basic
 \cite_engine_type default
 \biblio_style plain
@@ -9030,14 +9030,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -9050,7 +9048,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -9083,7 +9080,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -19102,39 +19098,17 @@ and
 
 \family default
 
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-
-\lang english
 \begin_inset Quotes jls
 \end_inset
 
 
-\end_layout
-
-\end_inset
-
-
 \family sans
 inner
 \family default
 
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-
-\lang english
 \begin_inset Quotes jrs
 \end_inset
 
-
-\end_layout
-
-\end_inset
-
  Produces 
 \begin_inset Quotes jld
 \end_inset
@@ -19144,35 +19118,13 @@ these outer
 \end_inset
 
  and 
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-
-\lang english
 \begin_inset Quotes jls
 \end_inset
 
-
-\end_layout
-
-\end_inset
-
 these inner
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-
-\lang english
 \begin_inset Quotes jrs
 \end_inset
 
-
-\end_layout
-
-\end_inset
-
  quotation marks (as common, e.
 \begin_inset space \thinspace{}
 \end_inset
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index e8bcb5b..9d6f062 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -124,14 +124,14 @@ End
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
-\use_package cancel 0
+\use_package cancel 1
 \use_package esint 1
 \use_package mathdots 1
-\use_package mathtools 0
+\use_package mathtools 1
 \use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
 \cite_engine basic
 \cite_engine_type 

[LyX/master] UserGuide.lyx: accept and distribute description of inverted branches

[Uwe Stöhr]

commit 5513e465893ae255f75aaecc304133ba01a89e08
Author: Uwe Stöhr 
Date:   Sun Jul 30 22:20:03 2017 +0200

UserGuide.lyx: accept and distribute description of inverted branches
---
 lib/doc/Changelog-UserGuide-LyX_23x.txt |1 +
 lib/doc/UserGuide.lyx   |   94 ++-
 lib/doc/de/UserGuide.lyx|   78 +
 lib/doc/es/UserGuide.lyx|   69 ++-
 lib/doc/fr/UserGuide.lyx|   69 ++-
 lib/doc/ja/UserGuide.lyx|   69 ++-
 6 files changed, 285 insertions(+), 95 deletions(-)

diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt 
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index 80fcb12..7d4f19a 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -5,6 +5,7 @@ Modified:
 first step:
 - sec. 3.9.3.2: section completely rewritten
 - sec. 6.1: new reference format and new options
+- sec. 6.8: new feature "inverted branches"
 - sec. C.1.2.3 new sentence
 
 
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 05829d2..e35d38f 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -146,7 +146,6 @@ enumitem
 \html_css_as_file 0
 \html_be_strict true
 \author -712698321 "Jürgen Spitzmüller"
-\author 424524441 "rgheck"
 \end_header
 
 \begin_body
@@ -8338,12 +8337,14 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 The following 2 lines are empty:
 \end_layout
 
@@ -8356,6 +8357,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8379,6 +8381,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -18086,13 +18089,7 @@ fest
 \begin_layout Subsection
 \SpecialChar LyX
  and \SpecialChar LaTeX
- 
-\change_deleted -712698321 1482669270
-l
-\change_inserted -712698321 1482669270
-L
-\change_unchanged
-ogos
+ Logos
 \begin_inset Index idx
 status collapsed
 
@@ -31848,7 +31845,11 @@ inverted 0
 status open
 
 \begin_layout Standard
-Question: Who was the first physics Nobel prize winner?
+
+\series bold
+Question:
+\series default
+ Who was the first physics Nobel prize winner?
 \end_layout
 
 \end_inset
@@ -31862,7 +31863,11 @@ inverted 0
 status collapsed
 
 \begin_layout Standard
-Answer: Wilhelm Conrad Röntgen
+
+\series bold
+Answer:
+\series default
+ Wilhelm Conrad Röntgen
 \end_layout
 
 \end_inset
@@ -31965,69 +31970,56 @@ Exam-Question-Answer.pdf
 
  if both branches were active.
  This helps you to export different versions of your document easily.
-\change_inserted 424524441 1468296009
+\begin_inset VSpace bigskip
+\end_inset
+
 
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted 424524441 1468297080
-As of LyX 2.3.0, there are also 
-\begin_inset Quotes eld
-\end_inset
-
-inverted
-\begin_inset Quotes erd
-\end_inset
-
- branch insets, whose content is output just in case the branch is 
+There are also inverted branch insets, whose content is output just in case
+ the branch is 
 \emph on
 not
 \emph default
  activated.
- 
-\begin_inset Branch Question
+ This make it easy to add alternative text for different versions of a 
document.
+ To control whether a particular inset is inverted, right-click on the inset
+ button and choose 
+\family sans
+Invert
+\begin_inset space ~
+\end_inset
+
+Inset
+\family default
+.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Branch Answer
 inverted 1
 status open
 
 \begin_layout Standard
 
-\change_inserted 424524441 1468296217
-For example, this material will only appear when the Question branch is
- deactivated.
-\change_unchanged
-
-\end_layout
-
-\end_inset
-
- This make it easy to add alternative text for different versions of a 
document.
- To control whether a particular inset is 
+\series bold
+No answer:
+\series default
+ Because the 
 \begin_inset Quotes eld
 \end_inset
 
-inverted
+Answer
 \begin_inset Quotes erd
 \end_inset
 
-, right-click on the inset button and choose 
-\begin_inset Quotes eld
-\end_inset
-
-
-\change_unchanged
-Invert Inset
-\change_inserted 424524441 1468297080
+ branch is deactivated.
+\end_layout
 
-\begin_inset Quotes erd
 \end_inset
 
-.
-\change_deleted 424524441 1468296150
-
-\end_layout
 
-\begin_layout Standard
 \begin_inset VSpace bigskip
 \end_inset
 
@@ -32151,7 +32143,7 @@ status collapsed
 
 \begin_layout Standard
 \begin_inset ERT
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 101524b..064b3f7 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -30946,7 +30946,11 @@ inverted 0
 status open
 
 \begin_layout Standard
-Frage: Wer war der erste Physik-Nobelpreis-Gewinner?
+
+\series bold

[LyX/master] EmbeddedObjects.lyx: remove description of the removed date inset

[Uwe Stöhr]

commit 19fc4c1655813a7d822fc6bb16cfdc092be747aa
Author: Uwe Stöhr 
Date:   Sun Jul 30 23:28:02 2017 +0200

EmbeddedObjects.lyx: remove description of the removed date inset

UserGuide.lyx: dito

 lib/doc/EmbeddedObjects.lyx|  423 -
 lib/doc/UserGuide.lyx  |   15 -
 lib/doc/de/EmbeddedObjects.lyx |  554 -
 lib/doc/de/UserGuide.lyx   |   19 +-
 lib/doc/es/EmbeddedObjects.lyx |  684 
 lib/doc/es/UserGuide.lyx   |   12 -
 lib/doc/fr/EmbeddedObjects.lyx |  662 +++---
 lib/doc/fr/UserGuide.lyx   |   12 -
 lib/doc/ja/EmbeddedObjects.lyx |  433 +-
 lib/doc/ja/UserGuide.lyx   |   11 +-
 10 files changed, 735 insertions(+), 2090 deletions(-)

[LyX/master] EmbeddedObjects.lyx: load all math packages automatically

[Uwe Stöhr]

commit 800edc01393bd72202bce884fc76e85528903fd5
Author: Uwe Stöhr 
Date:   Sun Jul 30 23:39:38 2017 +0200

EmbeddedObjects.lyx: load all math packages automatically
---
 lib/doc/EmbeddedObjects.lyx|   16 
 lib/doc/de/EmbeddedObjects.lyx |   16 
 lib/doc/es/EmbeddedObjects.lyx |   16 
 lib/doc/fr/EmbeddedObjects.lyx |   16 
 lib/doc/ja/EmbeddedObjects.lyx |   18 +-
 5 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 88ab383..19e978f 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -197,16 +197,16 @@ graphicboxes
 \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, 
filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, 
plainpages=false"
 \papersize default
 \use_geometry false
-\use_package amsmath 2
-\use_package amssymb 2
-\use_package cancel 0
-\use_package esint 0
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
 \use_package mathdots 1
-\use_package mathtools 0
+\use_package mathtools 1
 \use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
 \cite_engine basic
 \cite_engine_type default
 \biblio_style plain
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index dd55bc2..54f5848 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -200,16 +200,16 @@ graphicboxes
 \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, 
filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, 
plainpages=false"
 \papersize a4paper
 \use_geometry false
-\use_package amsmath 2
-\use_package amssymb 2
-\use_package cancel 0
-\use_package esint 0
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
 \use_package mathdots 1
-\use_package mathtools 0
+\use_package mathtools 1
 \use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
 \cite_engine basic
 \cite_engine_type default
 \biblio_style plain
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 7092c8e..c2b160a 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -201,16 +201,16 @@ graphicboxes
 \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, 
filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, 
plainpages=false"
 \papersize default
 \use_geometry false
-\use_package amsmath 2
-\use_package amssymb 2
-\use_package cancel 0
-\use_package esint 0
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
 \use_package mathdots 1
-\use_package mathtools 0
+\use_package mathtools 1
 \use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
 \cite_engine basic
 \cite_engine_type default
 \biblio_style plain
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index f0f5aca..19b0db4 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -203,16 +203,16 @@ graphicboxes
 \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, 
filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, 
plainpages=false"
 \papersize default
 \use_geometry false
-\use_package amsmath 2
-\use_package amssymb 2
-\use_package cancel 0
-\use_package esint 0
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
 \use_package mathdots 1
-\use_package mathtools 0
+\use_package mathtools 1
 \use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
 \cite_engine basic
 \cite_engine_type default
 \biblio_style plain
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 476d1e4..928700b 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -219,7 +219,7 @@ End
 \use_microtype false
 \use_dash_ligatures false
 \graphics default
-\default_output_format pdf3
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
@@ -242,16 +242,16 @@ End
 \pdf_quoted_options " linkcolor=black, citecolor=black, urlcolor=blue, 
filecolor=blue,  pdfpagelayout=OneColumn, pdfnewwindow=true,  pdfstartview=XYZ, 
plainpages=false, pdfpagelabels"
 \papersize default
 \use_geometry false
-\use_package amsmath 2
-\use_package amssymb 2
-\use_pa

[LyX/master] Math.lyx: remove unnecessary index entry

[Uwe Stöhr]

commit 97e1ce64bf8d971ea3b1667729e5c9f63ad84196
Author: Uwe Stöhr 
Date:   Sun Jul 30 23:40:15 2017 +0200

Math.lyx: remove unnecessary index entry

also update fileformat
---
 lib/doc/Math.lyx|   30 ++
 lib/doc/de/Math.lyx |   36 ++--
 lib/doc/es/Math.lyx |   30 ++
 lib/doc/fr/Math.lyx |   33 -
 lib/doc/ja/Math.lyx |   36 ++--
 5 files changed, 8 insertions(+), 157 deletions(-)

diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 1b70e87..62d8843 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 543
+\lyxformat 544
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -194,6 +194,7 @@
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \notefontcolor #ff
 \index Index
 \shortcut idx
@@ -26140,33 +26141,6 @@ aa
 
 \backslash
 AA
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-@
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-textrm{
-\backslash
-AA}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \end_inset
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index 37d13ee..d9872d4 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 543
+\lyxformat 544
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -206,6 +206,7 @@
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \notefontcolor #ff
 \index Stichwortverzeichnis
 \shortcut idx
@@ -25970,35 +25971,6 @@ aa
 
 \backslash
 AA
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-
-\backslash
-@
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-textrm{
-\backslash
-AA}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \end_inset
@@ -36866,14 +36838,10 @@ Einige Zeichen und Symbole können mit mehreren 
Befehlen erstellt werden.
 \end_inset
 
 
-\lang english
-
 \begin_inset space \hfill{}
 \end_inset
 
 
-\lang ngerman
-
 \begin_inset Tabular
 
 
diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index ecdd5be..3081540 100644
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 543
+\lyxformat 544
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -193,6 +193,7 @@
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \notefontcolor #ff
 \index Índice
 \shortcut idx
@@ -26443,33 +26444,6 @@ aa
 
 \backslash
 AA
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-@
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-textrm{
-\backslash
-AA}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \end_inset
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index 6bd2848..6c1d32b 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -26211,35 +26211,6 @@ aa
 
 \backslash
 AA
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-
-\backslash
-@
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-textrm{
-\backslash
-AA}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \end_inset
@@ -37543,14 +37514,10 @@ Certains caractères peuvent être obtenus en utilisant 
différentes commandes.
 \end_inset
 
 
-\lang english
-
 \begin_inset space \hfill{}
 \end_inset
 
 
-\lang french
-
 \begin_inset Tabular
 
 
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index 915c24e..863ff11 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -1,5 +1,5 @@
 #LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 543
+\lyxformat 544
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -229,6 +229,7 @@ End
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \notefontcolor #ff
 \index 索引
 \shortcut idx
@@ -25701,35 +25702,6 @@ aa
 
 \backslash
 AA
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-
-\backslash
-@
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-textrm{
-\backslash
-AA}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \end_inset
@@ -36264,14 +36236,10 @@ status collapsed
 \end_inset
 
 
-\lang english
-
 \begin_inset space \hfill{}
 \end_inset
 
 
-\lang japanese
-
 \begin_inset Tabular
 
 

[LyX/master] es.po: some translations for master

[Uwe Stöhr]

commit accb4846a88766f138dcf267c88ee74511e01565
Author: Uwe Stöhr 
Date:   Mon Jul 31 00:36:50 2017 +0200

es.po: some translations for master
---
 po/es.gmo |  Bin 464820 -> 472524 bytes
 po/es.po  |  340 -
 2 files changed, 113 insertions(+), 227 deletions(-)

diff --git a/po/es.gmo b/po/es.gmo
index 1e906f0..6459d04 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 396e63b..681ab46 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,20 +5,20 @@
 # German Poo Caaman~o , 2001.
 # Alfredo Braunstein , 2002, 2003.
 # Eulogio Serradilla , 2003, 2004, 2005, 2006, 2007.
-# Ignacio García , 2008.
+# Ignacio García , 2008 - 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: LyX 2.2\n"
+"Project-Id-Version: LyX 2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2017-06-13 02:09+0200\n"
-"PO-Revision-Date: 2016-02-15 09:44+0100\n"
+"PO-Revision-Date: 2017-07-30 23:16+0200\n"
 "Last-Translator: Ignacio García \n"
 "Language-Team: Spanish \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: src/frontends/qt4/ui/AboutUi.ui:33
 msgid "Version"
@@ -84,9 +84,8 @@ msgstr ""
 #: src/frontends/qt4/ui/BibitemUi.ui:88 src/frontends/qt4/ui/CitationUi.ui:368
 #: src/frontends/qt4/ui/HyperlinkUi.ui:80 src/frontends/qt4/ui/NomenclUi.ui:72
 #: src/frontends/qt4/ui/PrintindexUi.ui:74
-#, fuzzy
 msgid "Li&teral"
-msgstr "Literal"
+msgstr "Li&teral"
 
 #: src/frontends/qt4/ui/BiblioUi.ui:26
 msgid "Citation Style"
@@ -105,9 +104,8 @@ msgid ""
 msgstr ""
 
 #: src/frontends/qt4/ui/BiblioUi.ui:75
-#, fuzzy
 msgid "&Variant:"
-msgstr "Variación:"
+msgstr "&Variación:"
 
 #: src/frontends/qt4/ui/BiblioUi.ui:94
 msgid "Provides available cite style variants."
@@ -115,7 +113,6 @@ msgstr ""
 
 #: src/frontends/qt4/ui/BiblioUi.ui:118 src/frontends/qt4/GuiPrefs.cpp:826
 #: src/frontends/qt4/GuiPrefs.cpp:959
-#, fuzzy
 msgid "Opt&ions:"
 msgstr "Opc&iones:"
 
@@ -124,9 +121,8 @@ msgid "Here you can enter further options of the 
bibliography package"
 msgstr ""
 
 #: src/frontends/qt4/ui/BiblioUi.ui:154
-#, fuzzy
 msgid "Biblatex &citation style:"
-msgstr "E&stilo de cita:"
+msgstr "Biblatex &estilo de cita:"
 
 #: src/frontends/qt4/ui/BiblioUi.ui:164
 msgid "The style that determines the layout of the citations"
@@ -184,9 +180,8 @@ msgid ""
 msgstr ""
 
 #: src/frontends/qt4/ui/BiblioUi.ui:294
-#, fuzzy
 msgid "&Reset"
-msgstr "Reiniciar"
+msgstr "&Reiniciar"
 
 #: src/frontends/qt4/ui/BiblioUi.ui:305
 msgid "Select this if you want to split your bibliography into sections"
@@ -402,9 +397,8 @@ msgid "Add bibliography to &TOC"
 msgstr "Añadir bibliografía al I&G"
 
 #: src/frontends/qt4/ui/BibtexUi.ui:231
-#, fuzzy
 msgid "O&ptions:"
-msgstr "O&pción:"
+msgstr "O&pciónes:"
 
 #: src/frontends/qt4/ui/BibtexUi.ui:241
 msgid ""
@@ -640,9 +634,8 @@ msgid "Select your branch"
 msgstr "Seleccionar rama"
 
 #: src/frontends/qt4/ui/BranchUi.ui:37
-#, fuzzy
 msgid "Inverted"
-msgstr "Convertidores"
+msgstr "Invertido"
 
 #: src/frontends/qt4/ui/BranchesUi.ui:25
 msgid "&New:[[branch]]"
@@ -1005,9 +998,8 @@ msgid "Close"
 msgstr "Cerrar"
 
 #: src/frontends/qt4/ui/CitationUi.ui:27 src/frontends/qt4/ui/RefUi.ui:63
-#, fuzzy
 msgid "&Filter:"
-msgstr "Filtro:"
+msgstr "&Filtro:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:48
 msgid "Select the fields on which the filter applies"
@@ -1030,9 +1022,8 @@ msgid "Click for more filter options"
 msgstr ""
 
 #: src/frontends/qt4/ui/CitationUi.ui:96
-#, fuzzy
 msgid "O&ptions"
-msgstr "Opciones"
+msgstr "O&pciones"
 
 #: src/frontends/qt4/ui/CitationUi.ui:116
 msgid "A&vailable Citations:"
@@ -1055,21 +1046,18 @@ msgid "Move the selected citation down (Ctrl-Down)"
 msgstr "Mover abajo la cita seleccionada (Ctrl-Abajo)"
 
 #: src/frontends/qt4/ui/CitationUi.ui:229
-#, fuzzy
 msgid "Selected &Citations:"
 msgstr "Citas &seleccionadas:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "For&mato"
+msgst

[LyX/master] es.po: some more translations and corrections

[Uwe Stöhr]

commit 40be232fcfb9f0c6e28c2fa788596a0d564c020a
Author: Uwe Stöhr 
Date:   Mon Jul 31 23:01:11 2017 +0200

es.po: some more translations and corrections

 po/es.po |  458 --
 1 files changed, 206 insertions(+), 252 deletions(-)

[LyX/master] UserGuide.lyx: accept and distribute more changes

[Uwe Stöhr]

commit 89d1b15f080f8426bc650f2a04b8fcfe007e528e
Author: Uwe Stöhr 
Date:   Mon Jul 31 23:35:48 2017 +0200

UserGuide.lyx: accept and distribute more changes
---
 lib/doc/Changelog-UserGuide-LyX_23x.txt |1 +
 lib/doc/UserGuide.lyx   |   52 --
 lib/doc/de/UserGuide.lyx|   23 +++--
 lib/doc/es/UserGuide.lyx|   36 -
 lib/doc/fr/UserGuide.lyx|   37 --
 lib/doc/ja/UserGuide.lyx|   38 --
 6 files changed, 116 insertions(+), 71 deletions(-)

diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt 
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index 7d4f19a..6a0f17d 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -6,6 +6,7 @@ first step:
 - sec. 3.9.3.2: section completely rewritten
 - sec. 6.1: new reference format and new options
 - sec. 6.8: new feature "inverted branches"
+- sec. B.12 new sentences
 - sec. C.1.2.3 new sentence
 
 
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 5f45086..4aeea50 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8337,14 +8337,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -8357,7 +8355,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8381,7 +8378,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -44300,14 +44296,8 @@ Bibliography
 \end_layout
 
 \begin_layout Standard
-Here you can specify if a 
-\change_inserted -712698321 1483887883
-specific 
-\change_unchanged
-citation style using the \SpecialChar LaTeX
- packages
-\change_inserted -712698321 1483887840
- 
+Here you can specify if a specific citation style using the \SpecialChar LaTeX
+ packages 
 \series bold
 biblatex
 \series default
@@ -44316,17 +44306,13 @@ biblatex
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1483887846
 \SpecialChar LaTeX
 -packages ! biblatex
 \end_layout
 
 \end_inset
 
-,
-\change_unchanged
- 
+, 
 \series bold
 natbib
 \series default
@@ -44357,14 +44343,8 @@ status collapsed
 \end_inset
 
  should be used.
- 
-\change_inserted -712698321 1483887869
-If you use Bib\SpecialChar TeX
-, y
-\change_deleted -712698321 1483887870
-Y
-\change_unchanged
-ou can enable a 
+ If you use Bib\SpecialChar TeX
+, you can enable a 
 \family sans
 Sectioned bibliography
 \family default
@@ -44384,33 +44364,15 @@ status collapsed
 
 \end_inset
 
-
-\change_inserted -712698321 1483887945
 .
  If you use Biblatex, you can select the style files and specify further
  options.
-
-\change_unchanged
- 
-\change_inserted -712698321 1483887949
-Finally,
-\change_deleted -712698321 1483887950
-and
-\change_unchanged
- you can select a
-\change_inserted -712698321 1483887962
- document-specific
-\change_unchanged
- 
+ Finally, you can select a document-specific 
 \family sans
 Processor
 \family default
  for the generation of the bibliography.
- For a further description 
-\change_inserted -712698321 1483887970
-of all this, 
-\change_unchanged
-see section
+ For a further description of these possibilities see section
 \begin_inset space ~
 \end_inset
 
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 75c2574..c3e8d55 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -8603,12 +8603,10 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim
-
 Dies ist Unformatiert.
 \end_layout
 
 \begin_layout Verbatim
-
 Die folgenden 2 Zeilen sind leer:
 \end_layout
 
@@ -8621,7 +8619,6 @@ Die folgenden 2 Zeilen sind leer:
 \end_layout
 
 \begin_layout Verbatim
-
 Fast alles ist in Unformatiert erlaubt:"%&$§#~'`
 \backslash
 }][{|
@@ -8645,7 +8642,6 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim*
-
 Dies ist Unformatiert*.
 \end_layout
 
@@ -42815,7 +42811,7 @@ natbib
 \series default
 
 \begin_inset Index idx
-status open
+status collapsed
 
 \begin_layout Plain Layout
 \SpecialChar LaTeX
@@ -42840,13 +42836,9 @@ status collapsed
 \end_inset
 
  festlegen.
- Wenn Sie 
-\family sans
-Bib\SpecialChar TeX
-
-\family default
- verwenden, können Sie ein abschnittsspezifisches Literaturverzeichnis unter
- Verwendung des \SpecialChar LaTeX
+ Wenn Sie Bib\SpecialChar TeX
+ verwenden, können Sie ein abschnittsspezifisches Literaturverzeich
+nis unter Verwendung des \SpecialChar LaTeX
 -Pakets 
 \series bold
 bibtopic
@@ -42863,11 +42855,8 @@ status collapsed
 \end_inset
 
  aktivieren.
- Wenn Sie 
-\family sans
-Biblatex
-\family default
- verwenden, können Sie Stildateien auswählen und zusätzliche Optionen eingeben.
+ Wenn Sie Biblatex verwenden, können Sie Stildateie

[LyX/master] es.po: some more translations

[Uwe Stöhr]

commit 248c117020fffa024d939b9300a4124f587c457c
Author: Uwe Stöhr 
Date:   Wed Aug 2 00:30:56 2017 +0200

es.po: some more translations
---
 po/es.po |   66 -
 1 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/po/es.po b/po/es.po
index e4318a5..5dcbdb4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: LyX 2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2017-06-13 02:09+0200\n"
-"PO-Revision-Date: 2017-07-31 22:58+0200\n"
+"PO-Revision-Date: 2017-08-02 00:27+0200\n"
 "Last-Translator: Ignacio García \n"
 "Language-Team: Spanish \n"
 "Language: es\n"
@@ -7631,14 +7631,12 @@ msgid "Affiliation: "
 msgstr "Afiliación: "
 
 #: lib/layouts/acmart.layout:214
-#, fuzzy
 msgid "Additional Affiliation"
-msgstr "Afiliación alt."
+msgstr "Afiliación Adicional"
 
 #: lib/layouts/acmart.layout:216
-#, fuzzy
 msgid "Additional Affiliation: "
-msgstr "Afiliación alt."
+msgstr "Afiliación Adicional:"
 
 #: lib/layouts/acmart.layout:220 lib/layouts/acmart.layout:224
 #, fuzzy
@@ -7651,9 +7649,8 @@ msgid "Institution"
 msgstr "Institución"
 
 #: lib/layouts/acmart.layout:236 lib/layouts/acmart.layout:238
-#, fuzzy
 msgid "Department"
-msgstr "Reempla&zar con:"
+msgstr "Departamento"
 
 #: lib/layouts/acmart.layout:244 lib/layouts/acmart.layout:246
 #, fuzzy
@@ -7894,9 +7891,8 @@ msgid "Short authors: "
 msgstr "Autor corto:"
 
 #: lib/layouts/acmart.layout:499
-#, fuzzy
 msgid "Sidebar"
-msgstr "Ca&ra:"
+msgstr ""
 
 #: lib/layouts/acmart.layout:503
 msgid "Sidebar (sigchi-a only)"
@@ -10110,8 +10106,8 @@ msgid ""
 "Page Layout to 'fancy'!"
 msgstr ""
 "Añade entornos para definir líneas de encabezado y pie. NOTA: para usar este "
-"módulo hay que poner el  'Estilo de encabezado y pie elaborado' en el menú "
-"Documento > Configuración > Diseño de página"
+"módulo ¡hay que poner el  'Estilo de encabezado y pie elaborado' en el menú "
+"Documento > Configuración > Diseño de página!"
 
 #: lib/layouts/customHeadersFooters.module:12
 msgid "Header/Footer"
@@ -15952,9 +15948,8 @@ msgid "Definition \\thechapter.\\thedefinition."
 msgstr "Definición \\thechapter.\\thedefinition."
 
 #: lib/layouts/theorems-ams-chap-bytype.inc:251
-#, fuzzy
 msgid "Example \\thechapter.\\theexample."
-msgstr "Ejemplo  \\theexample"
+msgstr "Ejemplo \\thechapter.\\theexample."
 
 #: lib/layouts/theorems-ams-chap-bytype.inc:274
 msgid "Problem \\thechapter.\\theproblem."
@@ -19192,9 +19187,8 @@ msgid "Plain Quotation Mark|Q"
 msgstr "Marca Afiliación"
 
 #: lib/ui/stdmenus.inc:408
-#, fuzzy
 msgid "Inner Quotation Mark|n"
-msgstr "ángulo de rotación"
+msgstr ""
 
 #: lib/ui/stdmenus.inc:409
 msgid "Protected Hyphen|y"
@@ -25252,9 +25246,8 @@ msgid "The language %1$s is only supported by 
Polyglossia."
 msgstr ""
 
 #: src/Buffer.cpp:1941
-#, fuzzy
 msgid "Incompatible Languages!"
-msgstr "Nombre de comando incompatible."
+msgstr "¡Idiomas incompatible!"
 
 #: src/Buffer.cpp:1943
 #, c-format
@@ -26349,9 +26342,8 @@ msgid "&Run"
 msgstr ""
 
 #: src/Converter.cpp:319
-#, fuzzy
 msgid "&Always run for this document"
-msgstr "¿Cerrar u ocultar documento?"
+msgstr ""
 
 #: src/Converter.cpp:383 src/Converter.cpp:589 src/Converter.cpp:612
 #: src/Converter.cpp:655
@@ -28733,9 +28725,8 @@ msgstr ""
 "el archivo de Interfaz de usuario que se está utilizando."
 
 #: src/frontends/qt4/GuiBibitem.h:36
-#, fuzzy
 msgid "Bibliography Item Settings"
-msgstr "Configuración de entrada bibliográfica"
+msgstr "Configuración de la Entrada Bibliográfica"
 
 #: src/frontends/qt4/GuiBibtex.cpp:54
 msgid "BibTeX Bibliography"
@@ -29758,9 +29749,8 @@ msgid "(Module name: %1)"
 msgstr "Módulos requeridos: %1$s."
 
 #: src/frontends/qt4/GuiERT.h:33
-#, fuzzy
 msgid "TeX Mode Inset Settings"
-msgstr "Configuración del código TeX"
+msgstr "Configuración del Código TeX"
 
 #: src/frontends/qt4/GuiErrorList.cpp:47 src/frontends/qt4/GuiLog.cpp:260
 msgid "Literate"
@@ -29991,7 +29981,7 @@ msgstr "Configuración de espacio horizontal"
 
 #: src/frontends/qt4/GuiHyperlink.h:35
 msgid "Hyperlink Settings"
-msgstr ""
+msgstr "Configuración del Hiperenl

[LyX/master] UserGuide.lyx: accept and distribute more bibliography changes

[Uwe Stöhr]

commit fe04eeacfe293318923bbcefc3e60f16486fd502
Author: Uwe Stöhr 
Date:   Wed Aug 2 01:48:23 2017 +0200

UserGuide.lyx: accept and distribute more bibliography changes

 lib/doc/Changelog-UserGuide-LyX_23x.txt |1 +
 lib/doc/UserGuide.lyx   |  532 ---
 lib/doc/de/UserGuide.lyx|  262 +++-
 lib/doc/es/UserGuide.lyx|  317 +-
 lib/doc/fr/UserGuide.lyx|  319 +--
 lib/doc/ja/UserGuide.lyx|  308 +-
 6 files changed, 1353 insertions(+), 386 deletions(-)

[LyX/master] UserGuide.lyx: step 2 of accept and distribute more bibliography changes

[Uwe Stöhr]

commit f3400b5a6800bbe2f6fff579af8912dd44749385
Author: Uwe Stöhr 
Date:   Thu Aug 3 01:13:08 2017 +0200

UserGuide.lyx: step 2 of accept and distribute more bibliography changes

 lib/doc/UserGuide.lyx|  388 ++---
 lib/doc/de/UserGuide.lyx |  306 +
 lib/doc/es/UserGuide.lyx |  361 ++
 lib/doc/fr/UserGuide.lyx |  368 +++
 lib/doc/ja/UserGuide.lyx |  296 ---
 5 files changed, 1297 insertions(+), 422 deletions(-)

[LyX/master] UserGuide.lyx: step 3 of accept and distribute more bibliography changes

[Uwe Stöhr]

commit bb69389e42cb3dafe7de6da36992fd0f60c83d9c
Author: Uwe Stöhr 
Date:   Fri Aug 4 01:20:11 2017 +0200

UserGuide.lyx: step 3 of accept and distribute more bibliography changes
---
 lib/doc/UserGuide.lyx|  229 ++
 lib/doc/de/UserGuide.lyx |  106 +
 lib/doc/es/UserGuide.lyx |  154 ++-
 lib/doc/fr/UserGuide.lyx |  159 ++--
 lib/doc/ja/UserGuide.lyx |  134 ++-
 5 files changed, 345 insertions(+), 437 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 45bac44..310a0e2 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -28753,93 +28753,38 @@ Bibliography Processors
 
 \begin_layout Standard
 To generate the bibliography from a database, \SpecialChar LyX
- uses
-\change_inserted -712698321 1483885808
- a bibliography processor, that is an external program that reads a database,
- sorts the citations and processes the data in a way it can be included
- in the document.
-
-\change_unchanged
- 
-\change_inserted -712698321 1483885822
-The classic 
-\change_deleted -712698321 1483885823
-the 
-\change_unchanged
-program 
-\change_inserted -712698321 1483885903
-is called 
-\family sans
-bibtex
-\family default
+ uses a bibliography processor,
+ that is an external program that reads the database, sorts the citations
+ and processes the data in a way it can be included in the document.
+ The classic program is called Bib\SpecialChar TeX
 .
- As the whole approach, it has the advantage that it is very mature and
- widespread, but the disadvantage that it has severe limitations, due to
- its age.
+ It has the advantage that it is very mature and widespread, but the 
disadvantag
+e that it has severe limitations, due to its age.
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -712698321 1483885977
-Meanwhile, some alternatives have been developed that address (some of)
- these limitations.
+Meanwhile, some alternatives have been developed that address some of these
+ limitations.
  LyX natively supports some of them and lets you select a custom processor.
-\change_deleted -712698321 1483885997
-Bib\SpecialChar TeX
-.
-
-\change_unchanged
- You can 
-\change_inserted -712698321 1483886029
-do this on a general level in 
+ You can do this on a general level in 
 \family sans
 Tools\SpecialChar menuseparator
 Preferences\SpecialChar menuseparator
 Output\SpecialChar menuseparator
 LaTeX
 \family default
-, or for individual documents 
-\change_deleted -712698321 1483886038
-choose which of its variants should be used by \SpecialChar LyX
- as the 
-\family sans
-Processor
-\family default
- either 
-\change_unchanged
-in 
+ or for individual documents in 
 \family sans
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
 Bibliography
-\change_deleted -712698321 1483886043
-
-\family default
- or in 
-\family sans
-Tools\SpecialChar menuseparator
-Preferences\SpecialChar menuseparator
-Output\SpecialChar menuseparator
-LaTeX
-\change_unchanged
-
 \family default
 .
- The following variants are 
-\change_deleted -712698321 1483886168
-possible
-\change_inserted -712698321 1483886173
-available by default
-\change_unchanged
-:
+ The following variants are available by default:
 \end_layout
 
 \begin_layout Description
-biber 
-\change_inserted -712698321 1483886386
-a specific, modern processor
-\change_unchanged
-
+biber a specific, modern processor
 \begin_inset Index idx
 status collapsed
 
@@ -28850,122 +28795,55 @@ status collapsed
 
 \end_inset
 
-
-\change_inserted -712698321 1483886257
  developed exclusively for 
-\noun on
-Biblatex
-\noun default
+\series bold
+biblatex
+\series default
  (it does not work with Bib\SpecialChar TeX
 !).
  
-\change_unchanged
-
 \series bold
 biber
 \series default
- provides full Unicode support, unlimited memory
-\change_deleted -712698321 1483886272
-, but does not work with other bibliography packages (e.
-\begin_inset space \thinspace{}
-\end_inset
-
-g.
-\begin_inset space \space{}
-\end_inset
-
-
-\series bold
-natbib
-\series default
-), only with the package 
-\series bold
-biblatex
-\change_inserted -712698321 1483886347
-
-\series default
- and many specific features 
-\change_unchanged
-
+ provides full Unicode support, unlimited memory and many specific features
+ 
 \series bold
 biblatex
-\change_inserted -712698321 1483886347
-
 \series default
- makes use of
-\change_unchanged
-; 
-\change_deleted -712698321 1483886353
-recommended for multilingual texts and for languages that don't use Latin
- letters
-\change_inserted -712698321 1483886386
-if you use the 
-\change_unchanged
-
+ makes use of; if you use the 
 \series bold
 biblatex
-\change_inserted -712698321 1483886386
-
 \series default
  approach, it is strongly recommended to use 
-\family sans
+\series bold
 biber
-\family default
+\series default
 .
-\change_unchanged
-
 \end_l

[LyX/master] doc files: accept some leftovers from change tracking

[Uwe Stöhr]

commit d38b6feb25106fc58ab0a3ced21713a5df11eb6c
Author: Uwe Stöhr 
Date:   Fri Aug 4 23:36:01 2017 +0200

doc files: accept some leftovers from change tracking
---
 lib/doc/de/Additional.lyx|   36 +++--
 lib/doc/de/Customization.lyx |7 +
 lib/doc/es/Additional.lyx|   33 +++
 lib/doc/fr/Additional.lyx|   59 +++--
 lib/doc/fr/Customization.lyx |7 +
 lib/doc/ja/Additional.lyx|8 +-
 6 files changed, 21 insertions(+), 129 deletions(-)

diff --git a/lib/doc/de/Additional.lyx b/lib/doc/de/Additional.lyx
index 979f924..142d469 100644
--- a/lib/doc/de/Additional.lyx
+++ b/lib/doc/de/Additional.lyx
@@ -125,7 +125,6 @@ shapepar
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author 34634807 "Jean-Pierre"
 \end_header
 
 \begin_body
@@ -136,13 +135,7 @@ Erweiterte \SpecialChar LyX
 \end_layout
 
 \begin_layout Subtitle
-Version 2.
-\change_inserted 34634807 1499890698
-3
-\change_deleted 34634807 1499890696
-2
-\change_unchanged
-.x
+Version 2.3.x
 \end_layout
 
 \begin_layout Author
@@ -1322,20 +1315,7 @@ hoffset
 \backslash
 voffset
 \family default
-, für horizontale und vertikale Verschiebung (
-\emph on
-\lang english
-horizontal
-\emph default
-\lang ngerman
- bzw.
- 
-\emph on
-\lang english
-vertical offset
-\emph default
-\lang ngerman
-).
+, für horizontale und vertikale Verschiebung.
  Diese Variablen sind hilfreich, wenn die Papiergröße und die Seitengröße
  nicht übereinstimmen.
  Dann benutzt man 
@@ -5718,11 +5698,7 @@ Wenn Sie ein Client-Programm entwickeln, mag es für Sie 
hilfreich sein,
  Debugging-Informationen vom \SpecialChar LyX
 -Server zu erhalten.
  Diese bekommen Sie, wenn Sie \SpecialChar LyX
- mit folgender Option starten:
-\lang english
- 
-\lang ngerman
-
+ mit folgender Option starten: 
 \begin_inset Flex Code
 status collapsed
 
@@ -6598,11 +6574,7 @@ arg   "dialog-show prefs"
 Datei-Handhabung\SpecialChar menuseparator
 Konverter
 \family default
- in
-\lang english
- 
-\lang ngerman
-
+ in 
 \begin_inset Flex Code
 status collapsed
 
diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index d7019b5..1d3bed3 100644
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -131,7 +131,6 @@ logicalmkup
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
-\author 34634807 "Jean-Pierre"
 \end_header
 
 \begin_body
@@ -13932,11 +13931,7 @@ other
 
 \end_inset
 
- angeben, müssen Sie
-\change_deleted 34634807 1501859525
- 
-\change_unchanged
- als 
+ angeben, müssen Sie als 
 \emph on
 Wert
 \emph default
diff --git a/lib/doc/es/Additional.lyx b/lib/doc/es/Additional.lyx
index 98304a8..80f6af5 100644
--- a/lib/doc/es/Additional.lyx
+++ b/lib/doc/es/Additional.lyx
@@ -120,7 +120,6 @@ shapepar
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author 34634807 "Jean-Pierre"
 \end_header
 
 \begin_body
@@ -2076,10 +2075,6 @@ This happens if \SpecialChar LaTeX
  In many cases,
 \lang spanish
  será inapreciable en la salida (suele ser solo uno o dos puntos).
-
-\change_deleted 34634807 1501831912
- 
-\change_unchanged
  
 \lang english
 Sometimes, however, the lines run rather visibly into the margin; something
@@ -2890,10 +2885,6 @@ these
 \lang spanish
  paquetes es básicamente el mismo.
  Ve al submenú
-\change_deleted 34634807 1501831912
- 
-\change_unchanged
-
 \family sans
  
 \begin_inset Flex Noun
@@ -5748,12 +5739,7 @@ labelitem
 
 \begin_layout Itemize
 
-\change_deleted 34634807 1501831912
- 
-\change_unchanged
-
 \lang english
-
 \begin_inset Argument item:1
 status open
 
@@ -8191,11 +8177,7 @@ Editor
 
 \end_inset
 
-, selecciona
-\change_deleted 34634807 1501831912
- 
-\change_unchanged
- 
+, selecciona 
 \lang english
 yX
 \begin_inset Quotes erd
@@ -9071,12 +9053,9 @@ Email
 \end_layout
 
 \begin_layout Standard
-Además, las macros emplean
-\change_deleted 34634807 1501831912
- 
-\change_unchanged
- one comando \SpecialChar LaTeX
- adicionalque no tien contrapartida en \SpecialChar LyX
+Además, las macros emplean one comando \SpecialChar LaTeX
+ adicionalque no tien contrapartida
+ en \SpecialChar LyX
 :
 \end_layout
 
@@ -12694,10 +12673,6 @@ Teoremas, lemas, demostraciones y más
 \begin_layout Standard
 No puedes poner seguidos dos de estos entornos del mismo tipo.
 
-\change_deleted 34634807 1501831912
- 
-\change_unchanged
-
 \lang english
  If you use a normal paragraph break, you will just be extending the previous
  environment as if you had merged the two environments together.
diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx
index 64b5e04..d087f21 100644
--- a/lib/doc/fr/Additional.lyx
+++ b/lib/doc/fr/Additional.lyx
@@ -121,7 +121,6 @@ shapepar
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author 34634807 "Jean-Pierre"
 \end_header
 
 \begin_body
@@ -2246,10 +2245,6 @@

[LyX/master] UserGuide.lyx: step 4 of accept and distribute more bibliography changes

[Uwe Stöhr]

commit 1c9752471826676725bf5d307373b141e93a74f6
Author: Uwe Stöhr 
Date:   Sat Aug 5 03:21:07 2017 +0200

UserGuide.lyx: step 4 of accept and distribute more bibliography changes
---
 lib/doc/UserGuide.lyx|  313 ++
 lib/doc/de/UserGuide.lyx |  205 +-
 lib/doc/es/UserGuide.lyx |  243 +---
 lib/doc/fr/UserGuide.lyx |  256 +++---
 lib/doc/ja/UserGuide.lyx |  241 ++--
 5 files changed, 963 insertions(+), 295 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 310a0e2..cb1746d 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -28849,31 +28849,25 @@ biblatex
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -712698321 1484331301
-By default (with 
-\begin_inset Quotes eld
-\end_inset
-
-Default
-\begin_inset Quotes erd
-\end_inset
-
- bibliography processor set in 
+By default (with the 
+\family sans
+Processor
+\family default
+ set in 
 \family sans
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
 Bibliography
 \family default
- and 
-\begin_inset Quotes eld
-\end_inset
-
+ and with 
+\family sans
 Automatic
-\begin_inset Quotes erd
-\end_inset
-
- bibliography processor in 
+\family default
+ as setting for the 
+\family sans
+Processor
+\family default
+ in 
 \family sans
 Tools\SpecialChar menuseparator
 Preferences\SpecialChar menuseparator
@@ -28881,22 +28875,14 @@ Output\SpecialChar menuseparator
 LaTeX
 \family default
 ), \SpecialChar LyX
- selects the most appropriate (available) processor for the current bibliogra
-phy approach (
-\change_unchanged
-
+ selects an appropriate (available) processor for the current bibliography
+ approach (
 \series bold
 biber
-\change_inserted -712698321 1484331301
-
 \series default
  for 
-\change_unchanged
-
 \series bold
 biblatex
-\change_inserted -712698321 1484331301
-
 \series default
 , 
 \family sans
@@ -28905,22 +28891,17 @@ bibtex
  for Bib\SpecialChar TeX
 -based bibliography styles).
  This should suit most needs.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -712698321 1484331395
 In Japanese documents, a specific processor is used.
- By default, this is 
+ By default this is pBib\SpecialChar TeX
+ (in \SpecialChar LyX
+ 
 \family sans
 pbibtex
 \family default
-, a 
-\family sans
-bibtex
-\family default
+), a Bib\SpecialChar TeX
  variant specifically aimed at Japanese.
  You can adjust it in 
 \family sans
@@ -28930,8 +28911,6 @@ Output\SpecialChar menuseparator
 LaTeX
 \family default
 .
-\change_unchanged
-
 \end_layout
 
 \begin_layout Standard
@@ -29000,15 +28979,23 @@ name "subsec:Citation-Format"
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -712698321 1483888028
 Many different citation formats are common, e.
 \begin_inset space \thinspace{}
 \end_inset
 
 g.
- numerical citation (as used in this document), alpha-numerical citations
- (as 
+\begin_inset space \space{}
+\end_inset
+
+numerical citation (as 
+\begin_inset Quotes eld
+\end_inset
+
+1
+\begin_inset Quotes erd
+\end_inset
+
+ like in this document), alpha-numerical citations (as 
 \begin_inset Quotes eld
 \end_inset
 
@@ -29031,49 +29018,50 @@ Miller (2008a)
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -712698321 1483888432
-By default, a simple numeric citation style (as in this document) is used.
+By default a simple numeric citation style is used.
  In 
 \family sans
 Document\SpecialChar menuseparator
-Settings
+Settings\SpecialChar menuseparator
+Bibliography
 \family default
 
 \begin_inset Index idx
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1483888079
 Document ! Settings
 \end_layout
 
 \end_inset
 
-
-\family sans
-\SpecialChar menuseparator
-Bibliography
-\family default
-, however, you have a range of other options, depending on your preferred
- bibliography approach.
-\end_layout
-
-\begin_layout Standard
-
-\change_inserted -712698321 1483888408
-With the 
+ you have a range of other options, depending on your preferred bibliography
+ approach.
+ With the 
 \family sans
 Bibliography
 \family default
- environment, your only choice besides manual formatting of the bibliography
- labels, is 
+ environment your only choice besides manual formatting of the bibliography
+ labels, is there to use 
 \family sans
 Natbib
+\begin_inset space ~
+\end_inset
+
+(BibTeX)
 \family default
-, which gives you author-year and author-numerical citations (see above
+\series bold
  
+\series default
+as 
+\family sans
+Style
+\begin_inset space ~
+\end_inset
+
+format
+\family default
+ which gives you author-year and author-numerical citations (see above 
 \begin_inset CommandInset ref
 LatexCommand ref
 reference "subsec:The-Bibliography-Environment"
@@ -29084,14 +29072,7 @@ reference "subsec:The-Bibliography-

[LyX/master] UserGuide.lyx: last step of accept and distribute more bibliography changes

[Uwe Stöhr]

commit 5a6dfe1d9147f94fc0c0b03cb98b0ff038ebcf8d
Author: Uwe Stöhr 
Date:   Sat Aug 5 19:32:31 2017 +0200

UserGuide.lyx: last step of accept and distribute more bibliography changes
---
 lib/doc/UserGuide.lyx|  278 +++
 lib/doc/de/UserGuide.lyx |  176 
 lib/doc/es/UserGuide.lyx |  320 
 lib/doc/fr/UserGuide.lyx |  332 +++---
 lib/doc/ja/UserGuide.lyx |  320 
 5 files changed, 1148 insertions(+), 278 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index cb1746d..377c829 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -140,12 +140,11 @@ enumitem
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -712698321 "Jürgen Spitzmüller"
 \end_header
 
 \begin_body
@@ -29095,28 +29094,28 @@ Basic
 \begin_inset space ~
 \end_inset
 
-(BibTeX) 
-\change_inserted -712698321 1483888574
-the default
-\change_unchanged
- Bib\SpecialChar TeX
-
-\change_inserted -712698321 1483888574
--based approached without any additional packages (simple numeric citations)
+(BibTeX) the default Bib\SpecialChar TeX
+-based approached without any additional packages
+ (simple numeric citations).
 \end_layout
 
 \begin_layout Description
-Biblatex 
-\change_inserted -712698321 1483889266
-loads the package 
-\change_unchanged
-
+Biblatex loads the package 
 \series bold
 biblatex
 \series default
- 
-\change_inserted -712698321 1483889266
-and lets you select a style in the combo boxes 
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+\SpecialChar LaTeX
+ packages ! biblatex
+\end_layout
+
+\end_inset
+
+ and lets you select a style in the dropdown boxes 
 \family sans
 Biblatex citation style
 \family default
@@ -29125,14 +29124,9 @@ Biblatex citation style
 Biblatex bibliography style
 \family default
  below.
- Many different style variants are supported.
- Options to the package
-\change_unchanged
- 
+ Options to the package 
 \series bold
 biblatex
-\change_inserted -712698321 1483889266
-
 \series default
  can be entered in the 
 \family sans
@@ -29150,48 +29144,32 @@ Biblatex
 \begin_inset space ~
 \end_inset
 
-mode) 
-\change_inserted -712698321 1483889302
-loads the package
-\change_unchanged
- 
+mode) loads the package 
 \series bold
 biblatex
-\change_inserted -712698321 1483889302
-
 \series default
- with 
-\begin_inset Quotes eld
-\end_inset
-
-natbib compatibility mode
-\begin_inset Quotes erd
-\end_inset
-
- enabled.
- This is a specific variant that is aimed at users who switch an existing
- document that used 
-\family sans
-Natbib
-\family default
- (see below) or want to emulate 
+ with the natbib compatibility mode.
+ This is a specific variant for users who switch an existing document that
+ uses 
+\series bold
+natbib
+\series default
+ or want to emulate 
 \family sans
-Natbib
+the 
 \family default
+\series bold
+natbib
+\series default
  behavior very closely.
  Compared to normal 
 \family sans
 Biblatex
 \family default
-, this option has some additional styles.
- Style selection and option handling are identical.
+ this option has some additional styles.
  All 
-\change_unchanged
-
 \series bold
 biblatex
-\change_inserted -712698321 1483889302
-
 \series default
  styles are also supported by this variant.
 \end_layout
@@ -29201,11 +29179,7 @@ Jurabib
 \begin_inset space ~
 \end_inset
 
-(BibTeX) 
-\change_inserted -712698321 1483889321
-loads the package 
-\change_unchanged
-
+(BibTeX) loads the package 
 \series bold
 jurabib
 \series default
@@ -29220,9 +29194,7 @@ status collapsed
 
 \end_inset
 
- 
-\change_inserted -712698321 1483889321
-which provides author-year styles particularly suited for law studies.
+ which provides author-year styles particularly suited for law studies.
 \end_layout
 
 \begin_layout Description
@@ -29230,11 +29202,7 @@ Natbib
 \begin_inset space ~
 \end_inset
 
-(BibTeX) 
-\change_inserted -712698321 1483891582
-loads the package 
-\change_unchanged
-
+(BibTeX) loads the package 
 \series bold
 natbib
 \series default
@@ -29249,52 +29217,39 @@ status collapsed
 
 \end_inset
 
- 
-\change_inserted -712698321 1483891582
-which provides citation styles particularly suited for the Humanities.
-\change_unchanged
-
+ which provides citation styles particularly suited for the humanities.
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -712698321 1483891665
 The 
 \family sans
 Biblatex
 \family default
- variants and 
+ and 
 \family sans
 Natbib
 \family default
- furthermore provide the choice between author-year and author-numerical
+ style formats provide the choice between author-year and author-numerical
  citation styles.
- You have to select eithe

[LyX/master] Win installer: check another package used now by LyX

[Uwe Stöhr]

commit e4b9b4c27cc7dc7272a1af4602a5cf1aee92ea20
Author: Uwe Stöhr 
Date:   Sat Aug 5 19:33:29 2017 +0200

Win installer: check another package used now by LyX
---
 development/Win32/packaging/installer/Packages.txt |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/development/Win32/packaging/installer/Packages.txt 
b/development/Win32/packaging/installer/Packages.txt
index 80e3757..70a907b 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -266,6 +266,7 @@ datetime2-german
 tracklang
 acrotex
 zhmetrics
+logreq
 conv-xkv
 minted
 fvextra

[LyX/master] Win installer: check a package that LyX uses for instant preview

[Uwe Stöhr]

commit 1a6e10474c1b85c16f514e8fd9a071384142353f
Author: Uwe Stöhr 
Date:   Sat Aug 5 20:26:25 2017 +0200

Win installer: check a package that LyX uses for instant preview
---
 development/Win32/packaging/installer/Packages.txt |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/development/Win32/packaging/installer/Packages.txt 
b/development/Win32/packaging/installer/Packages.txt
index 70a907b..67be6b2 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -270,4 +270,5 @@ logreq
 conv-xkv
 minted
 fvextra
-xstring
\ No newline at end of file
+xstring
+luatex85
\ No newline at end of file

[LyX/2.2.x] Win installer: check for a package that LyX uses for instant preview

[Uwe Stöhr]

commit 4cb45dfffece44d0a1f0508f313b16eff5ad8c37
Author: Uwe Stöhr 
Date:   Sat Aug 5 20:27:01 2017 +0200

Win installer: check for a package that LyX uses for instant preview
---
 development/Win32/packaging/installer/Packages.txt |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/development/Win32/packaging/installer/Packages.txt 
b/development/Win32/packaging/installer/Packages.txt
index 87c21ff..23d8945 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -260,4 +260,5 @@ datetime2-german
 tracklang
 acrotex
 zhmetrics
-conv-xkv
\ No newline at end of file
+conv-xkv
+luatex85
\ No newline at end of file

[LyX/master] Win installer: updates for beta 1

[Uwe Stöhr]

commit a7c14968373b85e712fe660223e531661bb4936e
Author: Uwe Stöhr 
Date:   Tue Aug 15 21:06:19 2017 +0200

Win installer: updates for beta 1
---
 .../Win32/packaging/installer/ChangeLog.txt|6 +-
 .../Win32/packaging/installer/lyx-bundle.nsi   |2 +-
 .../Win32/packaging/installer/lyx-standard.nsi |2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/development/Win32/packaging/installer/ChangeLog.txt 
b/development/Win32/packaging/installer/ChangeLog.txt
index 777ca40..aed3a53 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,8 +1,12 @@
 Changelog for LyX-230-beta1:
 - installs LyX 2.3.0 beta1
 - updated to MiKTeX 2.9 build 6361
-- updated to ImageMagick 7.0.6-2
+- updated to ImageMagick 7.0.6-7
 - updated to Perl 5.24.2.1
+- updated to NSIS 3.0.2.1
+- updated thesaurus for Ukrainian
+- updated spell checker dictionaries for English (GB), Portuguese, Scottish and
+  Ukrainian
 
 
 Changelog for LyX-230-alpha1:
diff --git a/development/Win32/packaging/installer/lyx-bundle.nsi 
b/development/Win32/packaging/installer/lyx-bundle.nsi
index ce6a3e6..f42da21 100644
--- a/development/Win32/packaging/installer/lyx-bundle.nsi
+++ b/development/Win32/packaging/installer/lyx-bundle.nsi
@@ -1,6 +1,6 @@
 /*
 
-NSIS Script - LyX 2.2 Installer for Windows
+NSIS Script - LyX 2.3 Installer for Windows
 Authors: Joost Verburg, Angus Leeming, Uwe St�hr
 Compatible with NSIS 3.0
 
diff --git a/development/Win32/packaging/installer/lyx-standard.nsi 
b/development/Win32/packaging/installer/lyx-standard.nsi
index 638f8c6..721258b 100644
--- a/development/Win32/packaging/installer/lyx-standard.nsi
+++ b/development/Win32/packaging/installer/lyx-standard.nsi
@@ -1,5 +1,5 @@
 /*
-NSIS Script - LyX 2.2 Installer for Windows
+NSIS Script - LyX 2.3 Installer for Windows
 Authors: Joost Verburg, Angus Leeming, Uwe St�hr
 Compatible with NSIS 3.0
 */

[LyX/master] Japanese docs: add missing \origin tags

[Uwe Stöhr]

commit 4828d035fa4919f827673ec1e4db171f678121ce
Author: Uwe Stöhr 
Date:   Sat Sep 9 20:42:49 2017 +0200

Japanese docs: add missing \origin tags

- LyX cannot be compiled otherwise on Windows using CMake
- also correct version number and accept residues of change tracking
---
 lib/doc/ja/Additional.lyx  |   21 -
 lib/doc/ja/Customization.lyx   |4 ++--
 lib/doc/ja/EmbeddedObjects.lyx |2 +-
 lib/doc/ja/Intro.lyx   |2 +-
 lib/doc/ja/Math.lyx|6 +++---
 lib/doc/ja/Shortcuts.lyx   |5 ++---
 lib/doc/ja/Tutorial.lyx|2 +-
 lib/doc/ja/UserGuide.lyx   |   10 +++---
 8 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index e4bb605..0ec6aed 100644
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -3,7 +3,7 @@
 \begin_document
 \begin_header
 \save_transient_properties false
-\origin unavailable
+\origin /systemlyxdir/doc/ja/
 \textclass scrbook
 \begin_preamble
 % DO NOT ALTER THIS PREAMBLE!!!
@@ -172,7 +172,6 @@ End
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -1196488707 "横田 宏治"
 \end_header
 
 \begin_body
@@ -18749,11 +18748,7 @@ co -f -u<バージョン> <ファイル名>
 
 \begin_layout Labeling
 \labelwidthstring 00.00.
-RCSコマンド：
-\change_inserted -1196488707 1503192311
- 
-\change_unchanged
-
+RCSコマンド： 
 \begin_inset space ~
 \end_inset
 
@@ -19694,11 +19689,7 @@ svn revert -q
 
 \begin_layout Labeling
 \labelwidthstring 00.00.
-SVNコマンド：
-\change_inserted -1196488707 1503192295
- 
-\change_unchanged
-
+SVNコマンド： 
 \begin_inset space ~
 \end_inset
 
@@ -19755,11 +19746,7 @@ svn commit
 
 \begin_layout Labeling
 \labelwidthstring 00.00.
-SVNコマンド：
-\change_inserted -1196488707 1503192262
- 
-\change_unchanged
-
+SVNコマンド： 
 \begin_inset space ~
 \end_inset
 
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 1df2c1a..6d1a4e3 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -3,7 +3,7 @@
 \begin_document
 \begin_header
 \save_transient_properties false
-\origin unavailable
+\origin /systemlyxdir/doc/ja/
 \textclass scrbook
 \begin_preamble
 % DO NOT ALTER THIS PREAMBLE!!!
@@ -217,7 +217,7 @@ ast.net>をccにして送ってください．
 \begin_inset Newline newline
 \end_inset
 
-第2.3.x版 
+第2.3.x版
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 0bdb4c0..1c59baa 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -343,7 +343,7 @@ status collapsed
 
 
 \family sans
-第2.2.x版
+第2.3.x版
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/ja/Intro.lyx b/lib/doc/ja/Intro.lyx
index a0dfb9f..5159b4a 100644
--- a/lib/doc/ja/Intro.lyx
+++ b/lib/doc/ja/Intro.lyx
@@ -113,6 +113,7 @@ End
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \index 索引
 \shortcut idx
 \color #008000
@@ -133,7 +134,6 @@ End
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
-\use_minted 0
 \end_header
 
 \begin_body
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index f655e5b..dff06f9 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -3,7 +3,7 @@
 \begin_document
 \begin_header
 \save_transient_properties false
-\origin unavailable
+\origin /systemlyxdir/doc/ja/
 \textclass scrartcl
 \begin_preamble
 % DO NOT ALTER THIS PREAMBLE!!!
@@ -312,7 +312,7 @@ status collapsed
 
 
 \family sans
-第2.2.x版
+第2.3.x版
 \end_layout
 
 \begin_layout Standard
@@ -37042,7 +37042,7 @@ literal "false"
 \begin_inset CommandInset index_print
 LatexCommand printindex
 type "idx"
-name "索引"
+name "Index"
 literal "false"
 
 \end_inset
diff --git a/lib/doc/ja/Shortcuts.lyx b/lib/doc/ja/Shortcuts.lyx
index a72ae61..35802ab 100644
--- a/lib/doc/ja/Shortcuts.lyx
+++ b/lib/doc/ja/Shortcuts.lyx
@@ -79,6 +79,7 @@ End
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \index 索引
 \shortcut idx
 \color #008000
@@ -90,6 +91,7 @@ End
 \is_math_indent 0
 \math_numbering_side default
 \quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 1
 \paperpagestyle empty
@@ -98,7 +100,6 @@ End
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
-\use_minted 0
 \end_header
 
 \begin_body
@@ -164,8 +165,6 @@ status collapsed
 \end_layout
 
 \begin_layout Standard
-
-\lang english
 \begin_inset Tabular
 
 
diff --git a/lib/doc/ja/Tutorial.lyx b/lib/doc/ja/Tutorial.lyx
index 8f2debe..8e750ab 100644
--- a/lib/doc/ja/Tutorial.lyx
+++ b/lib/doc/ja/Tutorial.lyx
@@ -3,7 +3,7 @@
 \begin_document
 \begin_header
 \save_transient_properties false
-\origin unavailable
+\origin /systemlyxdir/doc/ja/
 \textclass jsbook
 \use_default_options false
 \maintain_unincluded_children false
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index a7627d9..06e7c73 100644

[LyX/master] Win installer: record a package that lyX uses now for Japanese documents

[Uwe Stöhr]

commit b186b08cff0b3d2f65dd261b8c88b3b8b6ebbf1f
Author: Uwe Stöhr 
Date:   Sat Sep 9 20:43:30 2017 +0200

Win installer: record a package that lyX uses now for Japanese documents
---
 development/Win32/packaging/installer/Packages.txt |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/development/Win32/packaging/installer/Packages.txt 
b/development/Win32/packaging/installer/Packages.txt
index 67be6b2..96bb413 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -271,4 +271,5 @@ conv-xkv
 minted
 fvextra
 xstring
-luatex85
\ No newline at end of file
+luatex85
+bxjscls
\ No newline at end of file

[LyX/2.3.x] backport Japanese docs: add missing \origin tags

[Uwe Stöhr]

commit 5ff01abb6b2524149698f3e59de452e2b7f6075c
Author: Uwe Stöhr 
Date:   Sun Sep 10 01:56:53 2017 +0200

backport Japanese docs: add missing \origin tags

- LyX cannot be compiled otherwise on Windows using CMake
- also correct version number and accept residues of change tracking
---
 lib/doc/ja/Additional.lyx  |   21 -
 lib/doc/ja/Customization.lyx   |4 ++--
 lib/doc/ja/EmbeddedObjects.lyx |2 +-
 lib/doc/ja/Intro.lyx   |2 +-
 lib/doc/ja/Math.lyx|6 +++---
 lib/doc/ja/Shortcuts.lyx   |5 ++---
 lib/doc/ja/Tutorial.lyx|2 +-
 lib/doc/ja/UserGuide.lyx   |   10 +++---
 8 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index e4bb605..0ec6aed 100644
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -3,7 +3,7 @@
 \begin_document
 \begin_header
 \save_transient_properties false
-\origin unavailable
+\origin /systemlyxdir/doc/ja/
 \textclass scrbook
 \begin_preamble
 % DO NOT ALTER THIS PREAMBLE!!!
@@ -172,7 +172,6 @@ End
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -1196488707 "横田 宏治"
 \end_header
 
 \begin_body
@@ -18749,11 +18748,7 @@ co -f -u<バージョン> <ファイル名>
 
 \begin_layout Labeling
 \labelwidthstring 00.00.
-RCSコマンド：
-\change_inserted -1196488707 1503192311
- 
-\change_unchanged
-
+RCSコマンド： 
 \begin_inset space ~
 \end_inset
 
@@ -19694,11 +19689,7 @@ svn revert -q
 
 \begin_layout Labeling
 \labelwidthstring 00.00.
-SVNコマンド：
-\change_inserted -1196488707 1503192295
- 
-\change_unchanged
-
+SVNコマンド： 
 \begin_inset space ~
 \end_inset
 
@@ -19755,11 +19746,7 @@ svn commit
 
 \begin_layout Labeling
 \labelwidthstring 00.00.
-SVNコマンド：
-\change_inserted -1196488707 1503192262
- 
-\change_unchanged
-
+SVNコマンド： 
 \begin_inset space ~
 \end_inset
 
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 1df2c1a..6d1a4e3 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -3,7 +3,7 @@
 \begin_document
 \begin_header
 \save_transient_properties false
-\origin unavailable
+\origin /systemlyxdir/doc/ja/
 \textclass scrbook
 \begin_preamble
 % DO NOT ALTER THIS PREAMBLE!!!
@@ -217,7 +217,7 @@ ast.net>をccにして送ってください．
 \begin_inset Newline newline
 \end_inset
 
-第2.3.x版 
+第2.3.x版
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 0bdb4c0..1c59baa 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -343,7 +343,7 @@ status collapsed
 
 
 \family sans
-第2.2.x版
+第2.3.x版
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/ja/Intro.lyx b/lib/doc/ja/Intro.lyx
index a0dfb9f..5159b4a 100644
--- a/lib/doc/ja/Intro.lyx
+++ b/lib/doc/ja/Intro.lyx
@@ -113,6 +113,7 @@ End
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \index 索引
 \shortcut idx
 \color #008000
@@ -133,7 +134,6 @@ End
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
-\use_minted 0
 \end_header
 
 \begin_body
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index f655e5b..dff06f9 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -3,7 +3,7 @@
 \begin_document
 \begin_header
 \save_transient_properties false
-\origin unavailable
+\origin /systemlyxdir/doc/ja/
 \textclass scrartcl
 \begin_preamble
 % DO NOT ALTER THIS PREAMBLE!!!
@@ -312,7 +312,7 @@ status collapsed
 
 
 \family sans
-第2.2.x版
+第2.3.x版
 \end_layout
 
 \begin_layout Standard
@@ -37042,7 +37042,7 @@ literal "false"
 \begin_inset CommandInset index_print
 LatexCommand printindex
 type "idx"
-name "索引"
+name "Index"
 literal "false"
 
 \end_inset
diff --git a/lib/doc/ja/Shortcuts.lyx b/lib/doc/ja/Shortcuts.lyx
index a72ae61..35802ab 100644
--- a/lib/doc/ja/Shortcuts.lyx
+++ b/lib/doc/ja/Shortcuts.lyx
@@ -79,6 +79,7 @@ End
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \index 索引
 \shortcut idx
 \color #008000
@@ -90,6 +91,7 @@ End
 \is_math_indent 0
 \math_numbering_side default
 \quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 1
 \paperpagestyle empty
@@ -98,7 +100,6 @@ End
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
-\use_minted 0
 \end_header
 
 \begin_body
@@ -164,8 +165,6 @@ status collapsed
 \end_layout
 
 \begin_layout Standard
-
-\lang english
 \begin_inset Tabular
 
 
diff --git a/lib/doc/ja/Tutorial.lyx b/lib/doc/ja/Tutorial.lyx
index 8f2debe..8e750ab 100644
--- a/lib/doc/ja/Tutorial.lyx
+++ b/lib/doc/ja/Tutorial.lyx
@@ -3,7 +3,7 @@
 \begin_document
 \begin_header
 \save_transient_properties false
-\origin unavailable
+\origin /systemlyxdir/doc/ja/
 \textclass jsbook
 \use_default_options false
 \maintain_unincluded_children false
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index a7627d9..0

[LyX/2.3.x] backport Win installer: record a package that LyX uses now for Japanese documents

[Uwe Stöhr]

commit 608a62cec1343f9c3a8c35792257e055d86f7c7e
Author: Uwe Stöhr 
Date:   Sun Sep 10 01:58:06 2017 +0200

backport Win installer: record a package that LyX uses now for Japanese 
documents
---
 development/Win32/packaging/installer/Packages.txt |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/development/Win32/packaging/installer/Packages.txt 
b/development/Win32/packaging/installer/Packages.txt
index 67be6b2..96bb413 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -271,4 +271,5 @@ conv-xkv
 minted
 fvextra
 xstring
-luatex85
\ No newline at end of file
+luatex85
+bxjscls
\ No newline at end of file

[LyX/master] libiconv: upgrade to version 1.15

[Uwe Stöhr]

commit cf214f8263ba3a6af1cc0766a99aa25455d06e1d
Author: Uwe Stöhr 
Date:   Sun Sep 10 14:46:37 2017 +0200

libiconv: upgrade to version 1.15

- libiconv 1.15 was released in February this year
- I opened a thread to discuss if this should also be done for the lyX 2.3 
branch on the list

 3rdparty/libiconv/1.14/COPYING.LIB |  482 -
 3rdparty/libiconv/1.14/include/export.h|6 -
 3rdparty/libiconv/1.14/include/iconv.h.build.in|  248 -
 3rdparty/libiconv/1.14/include/iconv.h.in  |  242 -
 3rdparty/libiconv/1.14/lib/aliases.gperf   |  358 -
 3rdparty/libiconv/1.14/lib/aliases.h   | 1719 ---
 3rdparty/libiconv/1.14/lib/aliases2.h  |   40 -
 3rdparty/libiconv/1.14/lib/aliases_aix.h   |   18 -
 3rdparty/libiconv/1.14/lib/aliases_aix_sysaix.h|   24 -
 3rdparty/libiconv/1.14/lib/aliases_dos.h   |   48 -
 3rdparty/libiconv/1.14/lib/aliases_extra.h |   12 -
 3rdparty/libiconv/1.14/lib/aliases_osf1.h  |2 -
 3rdparty/libiconv/1.14/lib/aliases_osf1_sysosf1.h  |4 -
 3rdparty/libiconv/1.14/lib/aliases_sysaix.gperf|  367 -
 3rdparty/libiconv/1.14/lib/aliases_sysaix.h| 1769 ---
 3rdparty/libiconv/1.14/lib/aliases_syshpux.gperf   |  368 -
 3rdparty/libiconv/1.14/lib/aliases_syshpux.h   | 1773 ---
 3rdparty/libiconv/1.14/lib/aliases_sysosf1.gperf   |  363 -
 3rdparty/libiconv/1.14/lib/aliases_sysosf1.h   | 1745 ---
 .../libiconv/1.14/lib/aliases_syssolaris.gperf |  365 -
 3rdparty/libiconv/1.14/lib/aliases_syssolaris.h| 1756 ---
 3rdparty/libiconv/1.14/lib/armscii_8.h |  116 -
 3rdparty/libiconv/1.14/lib/ascii.h |   44 -
 3rdparty/libiconv/1.14/lib/atarist.h   |  158 -
 3rdparty/libiconv/1.14/lib/big5.h  | 4160 --
 3rdparty/libiconv/1.14/lib/big5_2003.h |  476 -
 3rdparty/libiconv/1.14/lib/big5hkscs1999.h |  197 -
 3rdparty/libiconv/1.14/lib/big5hkscs2001.h |  215 -
 3rdparty/libiconv/1.14/lib/big5hkscs2004.h |  231 -
 3rdparty/libiconv/1.14/lib/big5hkscs2008.h |  247 -
 3rdparty/libiconv/1.14/lib/c99.h   |  125 -
 3rdparty/libiconv/1.14/lib/canonical.h |  110 -
 3rdparty/libiconv/1.14/lib/canonical_aix.h |9 -
 3rdparty/libiconv/1.14/lib/canonical_aix_sysaix.h  |9 -
 3rdparty/libiconv/1.14/lib/canonical_dos.h |   15 -
 3rdparty/libiconv/1.14/lib/canonical_extra.h   |7 -
 3rdparty/libiconv/1.14/lib/canonical_local.h   |2 -
 .../libiconv/1.14/lib/canonical_local_sysaix.h |2 -
 .../libiconv/1.14/lib/canonical_local_syshpux.h|2 -
 .../libiconv/1.14/lib/canonical_local_sysosf1.h|2 -
 .../libiconv/1.14/lib/canonical_local_syssolaris.h |2 -
 3rdparty/libiconv/1.14/lib/canonical_osf1.h|2 -
 .../libiconv/1.14/lib/canonical_osf1_sysosf1.h |2 -
 3rdparty/libiconv/1.14/lib/canonical_sysaix.h  |  110 -
 3rdparty/libiconv/1.14/lib/canonical_syshpux.h |  110 -
 3rdparty/libiconv/1.14/lib/canonical_sysosf1.h |  110 -
 3rdparty/libiconv/1.14/lib/canonical_syssolaris.h  |  110 -
 3rdparty/libiconv/1.14/lib/ces_big5.h  |   70 -
 3rdparty/libiconv/1.14/lib/ces_gbk.h   |   65 -
 3rdparty/libiconv/1.14/lib/cjk_variants.h  | 4241 --
 3rdparty/libiconv/1.14/lib/cns11643.h  |   41 -
 3rdparty/libiconv/1.14/lib/cns11643_1.h|  893 --
 3rdparty/libiconv/1.14/lib/cns11643_15.h   | 1083 --
 3rdparty/libiconv/1.14/lib/cns11643_2.h| 1112 --
 3rdparty/libiconv/1.14/lib/cns11643_3.h|  974 --
 3rdparty/libiconv/1.14/lib/cns11643_4.h|   61 -
 3rdparty/libiconv/1.14/lib/cns11643_4a.h   |  460 -
 3rdparty/libiconv/1.14/lib/cns11643_4b.h   |  668 -
 3rdparty/libiconv/1.14/lib/cns11643_5.h| 1278 --
 3rdparty/libiconv/1.14/lib/cns11643_6.h|  968 --
 3rdparty/libiconv/1.14/lib/cns11643_7.h|  988 --
 3rdparty/libiconv/1.14/lib/cns11643_inv.h  |15412 
 3rdparty/libiconv/1.14/lib/converters.h|  298 -
 3rdparty/libiconv/1.14/lib/cp1046.h|  157 -
 3rdparty/libiconv/1.14/lib/cp1124.h|  102 -
 3rdparty/libiconv/1.14/lib/cp1125.h|  129 -
 3rdparty/libiconv/1.14/lib/cp1129.h|  121 -
 3rdparty/libiconv/1.14/lib/cp1131.h|  132 -
 3rdparty/libiconv/1.14/lib/cp1133.h|  110 -
 3rdparty/libiconv/1.14/lib/cp1161.h|   89 -
 3rdparty/libiconv/1.14/lib/cp1162.h|   70 -
 3rdparty/libiconv/1.14/lib/cp1163.h|   63 -
 3rdparty/libiconv/1.14/lib/cp1250.h|  139 -
 3rdparty/libiconv/1.14/lib/cp1251.h|  131 -
 3rdparty/libiconv/1.14/lib/cp1252.h|  103 -
 3rdparty/libiconv/1.14/lib/cp1253.h|  122 -
 3rdparty

[LyX/master] libiconv/1.15: add some files new in the llibiconv sources

[Uwe Stöhr]

commit 39f15a6b0b8e5bb3b723ce4cf1ca48baf3e42a58
Author: Uwe Stöhr 
Date:   Sun Sep 10 15:05:28 2017 +0200

libiconv/1.15: add some files new in the llibiconv sources

 3rdparty/libiconv/1.15/lib/Makefile.in|  372 +
 3rdparty/libiconv/1.15/lib/config.h.in|   82 
 3rdparty/libiconv/1.15/lib/cp50221_0208_ext.h |  149 +++
 3rdparty/libiconv/1.15/lib/cp50221_0212_ext.h |  212 ++
 3rdparty/libiconv/1.15/lib/iso2022_jpms.h |  445 +
 3rdparty/libiconv/1.15/libcharset/lib/Makefile.in |  177 
 6 files changed, 1437 insertions(+), 0 deletions(-)

[LyX/master] libiconv: adapt makefile.am for new files in libiconv 1.15

[Uwe Stöhr]

commit a0b8eed96cfd969c0881e19b22c9604173226969
Author: Uwe Stöhr 
Date:   Sun Sep 10 15:19:40 2017 +0200

libiconv: adapt makefile.am for new files in libiconv 1.15
---
 3rdparty/libiconv/Makefile.am |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/3rdparty/libiconv/Makefile.am b/3rdparty/libiconv/Makefile.am
index 1cca0b9..e9b8b51 100644
--- a/3rdparty/libiconv/Makefile.am
+++ b/3rdparty/libiconv/Makefile.am
@@ -15,18 +15,21 @@ EXTRA_DIST = \
1.15/lib/aliases_syshpux.gperf \
1.15/lib/aliases_sysosf1.gperf \
1.15/lib/aliases_syssolaris.gperf \
+   1.15/lib/config.h.in \
1.15/lib/encodings_aix.def \
1.15/lib/encodings.def \
1.15/lib/encodings_dos.def \
1.15/lib/encodings_extra.def \
1.15/lib/encodings_local.def \
1.15/lib/encodings_osf1.def \
+   1.15/lib/Makefile.in \
1.15/lib/translit.def \
1.15/libcharset/include/libcharset.h.in \
1.15/libcharset/include/localcharset.h.build.in \
1.15/libcharset/include/localcharset.h.in \
1.15/libcharset/lib/ChangeLog \
1.15/libcharset/lib/config.charset \
+   1.15/libcharset/lib/Makefile.in \
1.15/libcharset/lib/ref-add.sin \
1.15/libcharset/lib/ref-del.sin
 
@@ -113,6 +116,8 @@ liblyxiconv_a_SOURCES = \
1.15/lib/cp1257.h \
1.15/lib/cp1258.h \
1.15/lib/cp437.h \
+   1.15/lib/cp50221_0208_ext.h \
+   1.15/lib/cp50221_0212_ext.h \
1.15/lib/cp737.h \
1.15/lib/cp775.h \
1.15/lib/cp850.h \
@@ -180,6 +185,7 @@ liblyxiconv_a_SOURCES = \
1.15/lib/iso2022_jp2.h \
1.15/lib/iso2022_jp3.h \
1.15/lib/iso2022_jp.h \
+   1.15/lib/iso2022_jpms.h \
1.15/lib/iso2022_kr.h \
1.15/lib/iso646_cn.h \
1.15/lib/iso646_jp.h \

[LyX/2.3.x] Win installer: adapt a path

[Uwe Stöhr]

commit 78221d4cb891bcdc1ba7f1d50824f9cb57f2202a
Author: Uwe Stöhr 
Date:   Sun Sep 10 17:05:49 2017 +0200

Win installer: adapt a path
---
 development/cmake/build5-2015.bat |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/development/cmake/build5-2015.bat 
b/development/cmake/build5-2015.bat
index 8274400..ab99a90 100644
--- a/development/cmake/build5-2015.bat
+++ b/development/cmake/build5-2015.bat
@@ -36,8 +36,8 @@ REM Edit pathes here or set the environment variables on your 
system.
 set CMAKE_PATH="C:\Program Files\CMake\bin"
 set QT_PATH="C:\Qt\Qt5.6.2-MSVC-2015\5.6\msvc2015\bin"
 set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2015"
-set LYX_SOURCE="D:\LyXGit\Master"
-set LYX_BUILD="D:\LyXGit\Master\compile-2015"
+set LYX_SOURCE="D:\LyXGit\2.3.x"
+set LYX_BUILD="D:\LyXGit\2.3.x\compile-2015"
 
 if [%LYX_SOURCE%]==[] (
set LYX_SOURCE=%~DP0\..\..

[LyX/2.3.x] Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

[Uwe Stöhr]

commit c7ec2f907cc7faace6343c459d62f7937b09ece9
Merge: 78221d4 0b6207d
Author: Uwe Stöhr 
Date:   Sun Sep 10 17:06:00 2017 +0200

Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

 lib/doc/Customization.lyx|  284 +++-
 lib/doc/de/Customization.lyx | 3896 +++---
 lib/scripts/svg2pdftex.py|6 +-
 lib/scripts/svg2pstex.py |7 +-
 4 files changed, 2033 insertions(+), 2160 deletions(-)

[LyX/2.3.x] Customization.lyx: accept and distribute latest changes

[Uwe Stöhr]

commit d7637e84cbfd343abe2b58b9ad613221fec04a0c
Author: Uwe Stöhr 
Date:   Sun Sep 10 23:53:53 2017 +0200

Customization.lyx: accept and distribute latest changes
---
 lib/doc/Changelog-Customization-LyX_23x.txt |   68 -
 lib/doc/Customization.lyx   |  202 +--
 lib/doc/de/Customization.lyx|9 +-
 lib/doc/es/Customization.lyx|  143 ---
 lib/doc/fr/Customization.lyx|  191 +-
 lib/doc/ja/Customization.lyx|  141 ---
 6 files changed, 441 insertions(+), 313 deletions(-)

diff --git a/lib/doc/Changelog-Customization-LyX_23x.txt 
b/lib/doc/Changelog-Customization-LyX_23x.txt
index 209025c..ac1eef0 100644
--- a/lib/doc/Changelog-Customization-LyX_23x.txt
+++ b/lib/doc/Changelog-Customization-LyX_23x.txt
@@ -1,42 +1,32 @@
-
-For lyx 2.3.0 (not J)
-
-* Sec. 2.1.2: new citeengines item
-   new xtemplates item
-
-* Sec. 2.1.4: remove external_templates item
-
-* Sec. 5.2.6: new section (Cite engine files)
-
-* Sec. 5.3.3: new section (Cite engine file declaration)
-
-* Sec. 5.3.4->5: new CiteEngine item
-new CiteFramework item
-   new MaxCiteNames item
-   new OutlinerName item
-
-* Sec. 5.3.6->7:  new AddToToc item
-  new PassThru
-  new IsTocCaption
-  new IsTocCaption item
-  new ResumeCounter item
-  new StepMasterCounter item
-
-* Sec. 5.3.9->10:  new AddToToc item
-  edit InToc item
- new IsTocCaption item
-
-* Sec. 5.3.12->13: new section (Citation engine description)
-
-* Sec. 5.3.13->14: add CiteFormat item syntax
-  add use instructions (2nd par.)
- new paragraph about special keys
- new paragraph about author lists
- word citation added (translatable text)
- phrase about cittengines (id.)
- 
-* Sec. 6.2: 3rd paragraph, introduce xtemplate files
-
+For LyX 2.3.0:
+
+- sec. 2.1.2: new citeengines item
+  new xtemplates item
+- sec. 2.1.4: remove external_templates item
+- sec. 5.2.6: new section (Cite engine files)
+- sec. 5.3.3: new section (Cite engine file declaration)
+- sec. 5.3.4->5: new CiteEngine item
+ new CiteFramework item
+new MaxCiteNames item
+new OutlinerName item
+- sec. 5.3.6->7: new AddToToc item
+ new PassThru
+ new IsTocCaption
+ new IsTocCaption item
+ new ResumeCounter item
+ new StepMasterCounter item
+- sec. 5.3.9->10: new AddToToc item
+  edit InToc item
+ new IsTocCaption item
+- sec. 5.3.12->13: new section (Citation engine description)
+- sec. 5.3.13->14: add CiteFormat item syntax
+   add use instructions (2nd par.)
+  new paragraph about special keys
+  new paragraph about author lists
+  word citation added (translatable text)
+  phrase about cittengines (id.)
+- sec. 6.2: 3rd paragraph, introduce xtemplate files
+- sec. B: some new sentences and 2 new colors
 
 
 For LyX 2.2.1:
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 4d9a9b9..45ebf33 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -124,12 +124,11 @@ logicalmkup
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -712698321 "Jürgen Spitzmüller"
 \end_header
 
 \begin_body
@@ -27584,45 +27583,24 @@ name "chap:Names-of-colors"
 \end_layout
 
 \begin_layout Standard
-The colors listed 
-\change_deleted -712698321 1505048041
-here
-\change_inserted -712698321 1505048041
-below
-\change_unchanged
- are the standard colors and 
-\change_deleted -712698321 1505048036
-the 
-\change_unchanged
-those that you can adjust in the \SpecialChar LyX
+The colors listed below are the standard colors and those that you can adjust
+ in the \SpecialChar LyX
  preferences.
-\change_inserted -712698321 1505047917
-
 \end_layout
 
 \begin_layout Section
-
-\change_inserted -712698321 1505048046
 Color functions
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -712698321 1505048063
 The following are no real colors, but rather act on color definitions:
-\change_unchanged
-
 \end_layout
 
 \begin_layout Description
-
-\change_inserted -712698321 1505049948
 ignore The color is ignored
 \end_layout
 
 \begin_layout Description
-
-\change_inserted -712698321 1505049948
 inherit The color is inherited
 \end_layout
 
@@ -27640,22 +27618,

[LyX/master] Customization.lyx: accept and distribute latest changes

[Uwe Stöhr]

commit ac4f286bd6189fdff1d7c1850f597f2c4b683c5b
Author: Uwe Stöhr 
Date:   Sun Sep 10 23:57:07 2017 +0200

Customization.lyx: accept and distribute latest changes
---
 lib/doc/Changelog-Customization-LyX_23x.txt |   68 -
 lib/doc/Customization.lyx   |  202 +--
 lib/doc/de/Customization.lyx|9 +-
 lib/doc/es/Customization.lyx|  143 ---
 lib/doc/fr/Customization.lyx|  191 +-
 lib/doc/ja/Customization.lyx|  141 ---
 6 files changed, 441 insertions(+), 313 deletions(-)

diff --git a/lib/doc/Changelog-Customization-LyX_23x.txt 
b/lib/doc/Changelog-Customization-LyX_23x.txt
index 209025c..ac1eef0 100644
--- a/lib/doc/Changelog-Customization-LyX_23x.txt
+++ b/lib/doc/Changelog-Customization-LyX_23x.txt
@@ -1,42 +1,32 @@
-
-For lyx 2.3.0 (not J)
-
-* Sec. 2.1.2: new citeengines item
-   new xtemplates item
-
-* Sec. 2.1.4: remove external_templates item
-
-* Sec. 5.2.6: new section (Cite engine files)
-
-* Sec. 5.3.3: new section (Cite engine file declaration)
-
-* Sec. 5.3.4->5: new CiteEngine item
-new CiteFramework item
-   new MaxCiteNames item
-   new OutlinerName item
-
-* Sec. 5.3.6->7:  new AddToToc item
-  new PassThru
-  new IsTocCaption
-  new IsTocCaption item
-  new ResumeCounter item
-  new StepMasterCounter item
-
-* Sec. 5.3.9->10:  new AddToToc item
-  edit InToc item
- new IsTocCaption item
-
-* Sec. 5.3.12->13: new section (Citation engine description)
-
-* Sec. 5.3.13->14: add CiteFormat item syntax
-  add use instructions (2nd par.)
- new paragraph about special keys
- new paragraph about author lists
- word citation added (translatable text)
- phrase about cittengines (id.)
- 
-* Sec. 6.2: 3rd paragraph, introduce xtemplate files
-
+For LyX 2.3.0:
+
+- sec. 2.1.2: new citeengines item
+  new xtemplates item
+- sec. 2.1.4: remove external_templates item
+- sec. 5.2.6: new section (Cite engine files)
+- sec. 5.3.3: new section (Cite engine file declaration)
+- sec. 5.3.4->5: new CiteEngine item
+ new CiteFramework item
+new MaxCiteNames item
+new OutlinerName item
+- sec. 5.3.6->7: new AddToToc item
+ new PassThru
+ new IsTocCaption
+ new IsTocCaption item
+ new ResumeCounter item
+ new StepMasterCounter item
+- sec. 5.3.9->10: new AddToToc item
+  edit InToc item
+ new IsTocCaption item
+- sec. 5.3.12->13: new section (Citation engine description)
+- sec. 5.3.13->14: add CiteFormat item syntax
+   add use instructions (2nd par.)
+  new paragraph about special keys
+  new paragraph about author lists
+  word citation added (translatable text)
+  phrase about cittengines (id.)
+- sec. 6.2: 3rd paragraph, introduce xtemplate files
+- sec. B: some new sentences and 2 new colors
 
 
 For LyX 2.2.1:
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 4d9a9b9..45ebf33 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -124,12 +124,11 @@ logicalmkup
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -712698321 "Jürgen Spitzmüller"
 \end_header
 
 \begin_body
@@ -27584,45 +27583,24 @@ name "chap:Names-of-colors"
 \end_layout
 
 \begin_layout Standard
-The colors listed 
-\change_deleted -712698321 1505048041
-here
-\change_inserted -712698321 1505048041
-below
-\change_unchanged
- are the standard colors and 
-\change_deleted -712698321 1505048036
-the 
-\change_unchanged
-those that you can adjust in the \SpecialChar LyX
+The colors listed below are the standard colors and those that you can adjust
+ in the \SpecialChar LyX
  preferences.
-\change_inserted -712698321 1505047917
-
 \end_layout
 
 \begin_layout Section
-
-\change_inserted -712698321 1505048046
 Color functions
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -712698321 1505048063
 The following are no real colors, but rather act on color definitions:
-\change_unchanged
-
 \end_layout
 
 \begin_layout Description
-
-\change_inserted -712698321 1505049948
 ignore The color is ignored
 \end_layout
 
 \begin_layout Description
-
-\change_inserted -712698321 1505049948
 inherit The color is inherited
 \end_layout
 
@@ -27640,22 +27618,

[LyX/master] Customization.lyx: some small adjustments

[Uwe Stöhr]

commit a0c567d96ffdc6b18c794fb4ebca7c10301b6177
Author: Uwe Stöhr 
Date:   Mon Sep 11 00:23:27 2017 +0200

Customization.lyx: some small adjustments
---
 lib/doc/Changelog-Customization-LyX_23x.txt |   15 +++
 lib/doc/Customization.lyx   |   11 +--
 lib/doc/de/Customization.lyx|6 +++---
 lib/doc/es/Customization.lyx|   22 --
 lib/doc/fr/Customization.lyx|   27 ++-
 5 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/lib/doc/Changelog-Customization-LyX_23x.txt 
b/lib/doc/Changelog-Customization-LyX_23x.txt
index ac1eef0..421d3f6 100644
--- a/lib/doc/Changelog-Customization-LyX_23x.txt
+++ b/lib/doc/Changelog-Customization-LyX_23x.txt
@@ -2,13 +2,12 @@
 
 - sec. 2.1.2: new citeengines item
   new xtemplates item
-- sec. 2.1.4: remove external_templates item
 - sec. 5.2.6: new section (Cite engine files)
 - sec. 5.3.3: new section (Cite engine file declaration)
 - sec. 5.3.4->5: new CiteEngine item
  new CiteFramework item
-new MaxCiteNames item
-new OutlinerName item
+ new MaxCiteNames item
+ new OutlinerName item
 - sec. 5.3.6->7: new AddToToc item
  new PassThru
  new IsTocCaption
@@ -17,14 +16,14 @@
  new StepMasterCounter item
 - sec. 5.3.9->10: new AddToToc item
   edit InToc item
- new IsTocCaption item
+  new IsTocCaption item
 - sec. 5.3.12->13: new section (Citation engine description)
 - sec. 5.3.13->14: add CiteFormat item syntax
add use instructions (2nd par.)
-  new paragraph about special keys
-  new paragraph about author lists
-  word citation added (translatable text)
-  phrase about cittengines (id.)
+   new paragraph about special keys
+   new paragraph about author lists
+   word citation added (translatable text)
+   phrase about cittengines (id.)
 - sec. 6.2: 3rd paragraph, introduce xtemplate files
 - sec. B: some new sentences and 2 new colors
 
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 45ebf33..882290b 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -7647,8 +7647,7 @@ More specifically, it is defined which packages 
\SpecialChar LyX
  in 
 \family sans
 Document\SpecialChar menuseparator
-Settings\SpecialChar ldots
-\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
 Bibliography\SpecialChar menuseparator
 Style engine
 \family default
@@ -8412,7 +8411,7 @@ to
 \end_layout
 
 \begin_layout Standard
-The module declaration should then be followed by lines like the following
+The module declaration should then be followed by lines like the following:
 \begin_inset Foot
 status collapsed
 
@@ -8425,7 +8424,7 @@ Preferably in English if the module should be published 
with \SpecialChar LyX
 
 \end_inset
 
-:
+
 \end_layout
 
 \begin_layout LyX-Code
@@ -8577,7 +8576,7 @@ Bibliography
 \end_layout
 
 \begin_layout Standard
-The cite engine declaration should then be followed by lines like the following
+The cite engine declaration should then be followed by lines like the 
following:
 \begin_inset Foot
 status collapsed
 
@@ -8590,7 +8589,7 @@ Preferably in English if the module should be published 
with \SpecialChar LyX
 
 \end_inset
 
-:
+
 \end_layout
 
 \begin_layout LyX-Code
diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 731ba88..41d82b0 100644
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -6186,13 +6186,14 @@ Beachten Sie, das manuelle Konvertierungen keine 
eingefügten Dateien mit
 \end_layout
 
 \begin_layout Subsection
+Cite-Engine-Dateien
 \begin_inset CommandInset label
 LatexCommand label
 name "subsec:Cite-Engine-Dateien"
 
 \end_inset
 
-Cite-Engine-Dateien
+
 \end_layout
 
 \begin_layout Standard
@@ -6252,8 +6253,7 @@ Genauer wird dort spezifiziert, welche Pakete 
\SpecialChar LyX
  die in 
 \family sans
 Dokument\SpecialChar menuseparator
-Einstellungen\SpecialChar ldots
-\SpecialChar menuseparator
+Einstellungen\SpecialChar menuseparator
 Literaturverzeichnis
 \family default
  erscheinen.
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index 3ccef36..d9c2eda 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -7261,8 +7261,7 @@ More specifically, it is defined which packages 
\SpecialChar LyX
  in 
 \family sans
 Document\SpecialChar menuseparator
-Settings\SpecialChar ldots
-\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
 Bibliography\SpecialChar menuseparator
 Style engine
 \family default
@@ -7323,7 +7322,9 @@ CiteFormat
 \end_inset
 
  blocks.
- The syntax of the latter t

[LyX/2.3.x] Customization.lyx: some small adjustments

[Uwe Stöhr]

commit e013df6d8acc79fa95fa4fa1d07e3b6e93866070
Author: Uwe Stöhr 
Date:   Mon Sep 11 00:23:05 2017 +0200

Customization.lyx: some small adjustments
---
 lib/doc/Changelog-Customization-LyX_23x.txt |   15 +++
 lib/doc/Customization.lyx   |   11 +--
 lib/doc/de/Customization.lyx|6 +++---
 lib/doc/es/Customization.lyx|   22 --
 lib/doc/fr/Customization.lyx|   27 ++-
 5 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/lib/doc/Changelog-Customization-LyX_23x.txt 
b/lib/doc/Changelog-Customization-LyX_23x.txt
index ac1eef0..421d3f6 100644
--- a/lib/doc/Changelog-Customization-LyX_23x.txt
+++ b/lib/doc/Changelog-Customization-LyX_23x.txt
@@ -2,13 +2,12 @@
 
 - sec. 2.1.2: new citeengines item
   new xtemplates item
-- sec. 2.1.4: remove external_templates item
 - sec. 5.2.6: new section (Cite engine files)
 - sec. 5.3.3: new section (Cite engine file declaration)
 - sec. 5.3.4->5: new CiteEngine item
  new CiteFramework item
-new MaxCiteNames item
-new OutlinerName item
+ new MaxCiteNames item
+ new OutlinerName item
 - sec. 5.3.6->7: new AddToToc item
  new PassThru
  new IsTocCaption
@@ -17,14 +16,14 @@
  new StepMasterCounter item
 - sec. 5.3.9->10: new AddToToc item
   edit InToc item
- new IsTocCaption item
+  new IsTocCaption item
 - sec. 5.3.12->13: new section (Citation engine description)
 - sec. 5.3.13->14: add CiteFormat item syntax
add use instructions (2nd par.)
-  new paragraph about special keys
-  new paragraph about author lists
-  word citation added (translatable text)
-  phrase about cittengines (id.)
+   new paragraph about special keys
+   new paragraph about author lists
+   word citation added (translatable text)
+   phrase about cittengines (id.)
 - sec. 6.2: 3rd paragraph, introduce xtemplate files
 - sec. B: some new sentences and 2 new colors
 
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 45ebf33..882290b 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -7647,8 +7647,7 @@ More specifically, it is defined which packages 
\SpecialChar LyX
  in 
 \family sans
 Document\SpecialChar menuseparator
-Settings\SpecialChar ldots
-\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
 Bibliography\SpecialChar menuseparator
 Style engine
 \family default
@@ -8412,7 +8411,7 @@ to
 \end_layout
 
 \begin_layout Standard
-The module declaration should then be followed by lines like the following
+The module declaration should then be followed by lines like the following:
 \begin_inset Foot
 status collapsed
 
@@ -8425,7 +8424,7 @@ Preferably in English if the module should be published 
with \SpecialChar LyX
 
 \end_inset
 
-:
+
 \end_layout
 
 \begin_layout LyX-Code
@@ -8577,7 +8576,7 @@ Bibliography
 \end_layout
 
 \begin_layout Standard
-The cite engine declaration should then be followed by lines like the following
+The cite engine declaration should then be followed by lines like the 
following:
 \begin_inset Foot
 status collapsed
 
@@ -8590,7 +8589,7 @@ Preferably in English if the module should be published 
with \SpecialChar LyX
 
 \end_inset
 
-:
+
 \end_layout
 
 \begin_layout LyX-Code
diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 731ba88..41d82b0 100644
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -6186,13 +6186,14 @@ Beachten Sie, das manuelle Konvertierungen keine 
eingefügten Dateien mit
 \end_layout
 
 \begin_layout Subsection
+Cite-Engine-Dateien
 \begin_inset CommandInset label
 LatexCommand label
 name "subsec:Cite-Engine-Dateien"
 
 \end_inset
 
-Cite-Engine-Dateien
+
 \end_layout
 
 \begin_layout Standard
@@ -6252,8 +6253,7 @@ Genauer wird dort spezifiziert, welche Pakete 
\SpecialChar LyX
  die in 
 \family sans
 Dokument\SpecialChar menuseparator
-Einstellungen\SpecialChar ldots
-\SpecialChar menuseparator
+Einstellungen\SpecialChar menuseparator
 Literaturverzeichnis
 \family default
  erscheinen.
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index 3ccef36..d9c2eda 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -7261,8 +7261,7 @@ More specifically, it is defined which packages 
\SpecialChar LyX
  in 
 \family sans
 Document\SpecialChar menuseparator
-Settings\SpecialChar ldots
-\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
 Bibliography\SpecialChar menuseparator
 Style engine
 \family default
@@ -7323,7 +7322,9 @@ CiteFormat
 \end_inset
 
  blocks.
- The syntax of the latter t

[LyX/2.3.x] Customization.lyx: fix a typo

[Uwe Stöhr]

commit e249e756be46ddce4c697eff6c2eea4bc9b385ed
Author: Uwe Stöhr 
Date:   Mon Sep 11 21:19:53 2017 +0200

Customization.lyx: fix a typo
---
 lib/doc/Customization.lyx |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 882290b..61cb1e3 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -14766,7 +14766,7 @@ status collapsed
 
 \end_inset
 
-] Determines whether consecutive pragraphs of the same type are treated
+] Determines whether consecutive paragraphs of the same type are treated
  as belonging together.
  This has the effect that the 
 \begin_inset Flex Code

[LyX/2.2.x] Customization.lyx: fix a typo

[Uwe Stöhr]

commit ca999d76a1bcb67eaedba434594a472f62a4af71
Author: Uwe Stöhr 
Date:   Mon Sep 11 21:19:38 2017 +0200

Customization.lyx: fix a typo
---
 lib/doc/Customization.lyx |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 3ca022e..af0f3fa 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -14118,7 +14118,7 @@ status collapsed
 
 \end_inset
 
-] Determines whether consecutive pragraphs of the same type are treated
+] Determines whether consecutive paragraphs of the same type are treated
  as belonging together.
  This has the effect that the 
 \begin_inset Flex Code

[LyX/master] Customization.lyx: fix a typo

[Uwe Stöhr]

commit cec1a005f57e69158c255e2240ca5eece2ce0924
Author: Uwe Stöhr 
Date:   Mon Sep 11 21:20:10 2017 +0200

Customization.lyx: fix a typo
---
 lib/doc/Customization.lyx |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 882290b..61cb1e3 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -14766,7 +14766,7 @@ status collapsed
 
 \end_inset
 
-] Determines whether consecutive pragraphs of the same type are treated
+] Determines whether consecutive paragraphs of the same type are treated
  as belonging together.
  This has the effect that the 
 \begin_inset Flex Code

[LyX/2.3.x] libiconv: upgrade to version 1.15

[Uwe Stöhr]

commit c88e9e57efd700b290290eeb0a1094df504b4d6c
Author: Uwe Stöhr 
Date:   Tue Sep 12 23:15:43 2017 +0200

libiconv: upgrade to version 1.15

 3rdparty/libiconv/1.14/COPYING.LIB |  482 -
 3rdparty/libiconv/1.14/include/export.h|6 -
 3rdparty/libiconv/1.14/include/iconv.h.build.in|  248 -
 3rdparty/libiconv/1.14/include/iconv.h.in  |  242 -
 3rdparty/libiconv/1.14/lib/aliases.gperf   |  358 -
 3rdparty/libiconv/1.14/lib/aliases.h   | 1719 ---
 3rdparty/libiconv/1.14/lib/aliases2.h  |   40 -
 3rdparty/libiconv/1.14/lib/aliases_aix.h   |   18 -
 3rdparty/libiconv/1.14/lib/aliases_aix_sysaix.h|   24 -
 3rdparty/libiconv/1.14/lib/aliases_dos.h   |   48 -
 3rdparty/libiconv/1.14/lib/aliases_extra.h |   12 -
 3rdparty/libiconv/1.14/lib/aliases_osf1.h  |2 -
 3rdparty/libiconv/1.14/lib/aliases_osf1_sysosf1.h  |4 -
 3rdparty/libiconv/1.14/lib/aliases_sysaix.gperf|  367 -
 3rdparty/libiconv/1.14/lib/aliases_sysaix.h| 1769 ---
 3rdparty/libiconv/1.14/lib/aliases_syshpux.gperf   |  368 -
 3rdparty/libiconv/1.14/lib/aliases_syshpux.h   | 1773 ---
 3rdparty/libiconv/1.14/lib/aliases_sysosf1.gperf   |  363 -
 3rdparty/libiconv/1.14/lib/aliases_sysosf1.h   | 1745 ---
 .../libiconv/1.14/lib/aliases_syssolaris.gperf |  365 -
 3rdparty/libiconv/1.14/lib/aliases_syssolaris.h| 1756 ---
 3rdparty/libiconv/1.14/lib/armscii_8.h |  116 -
 3rdparty/libiconv/1.14/lib/ascii.h |   44 -
 3rdparty/libiconv/1.14/lib/atarist.h   |  158 -
 3rdparty/libiconv/1.14/lib/big5.h  | 4160 --
 3rdparty/libiconv/1.14/lib/big5_2003.h |  476 -
 3rdparty/libiconv/1.14/lib/big5hkscs1999.h |  197 -
 3rdparty/libiconv/1.14/lib/big5hkscs2001.h |  215 -
 3rdparty/libiconv/1.14/lib/big5hkscs2004.h |  231 -
 3rdparty/libiconv/1.14/lib/big5hkscs2008.h |  247 -
 3rdparty/libiconv/1.14/lib/c99.h   |  125 -
 3rdparty/libiconv/1.14/lib/canonical.h |  110 -
 3rdparty/libiconv/1.14/lib/canonical_aix.h |9 -
 3rdparty/libiconv/1.14/lib/canonical_aix_sysaix.h  |9 -
 3rdparty/libiconv/1.14/lib/canonical_dos.h |   15 -
 3rdparty/libiconv/1.14/lib/canonical_extra.h   |7 -
 3rdparty/libiconv/1.14/lib/canonical_local.h   |2 -
 .../libiconv/1.14/lib/canonical_local_sysaix.h |2 -
 .../libiconv/1.14/lib/canonical_local_syshpux.h|2 -
 .../libiconv/1.14/lib/canonical_local_sysosf1.h|2 -
 .../libiconv/1.14/lib/canonical_local_syssolaris.h |2 -
 3rdparty/libiconv/1.14/lib/canonical_osf1.h|2 -
 .../libiconv/1.14/lib/canonical_osf1_sysosf1.h |2 -
 3rdparty/libiconv/1.14/lib/canonical_sysaix.h  |  110 -
 3rdparty/libiconv/1.14/lib/canonical_syshpux.h |  110 -
 3rdparty/libiconv/1.14/lib/canonical_sysosf1.h |  110 -
 3rdparty/libiconv/1.14/lib/canonical_syssolaris.h  |  110 -
 3rdparty/libiconv/1.14/lib/ces_big5.h  |   70 -
 3rdparty/libiconv/1.14/lib/ces_gbk.h   |   65 -
 3rdparty/libiconv/1.14/lib/cjk_variants.h  | 4241 --
 3rdparty/libiconv/1.14/lib/cns11643.h  |   41 -
 3rdparty/libiconv/1.14/lib/cns11643_1.h|  893 --
 3rdparty/libiconv/1.14/lib/cns11643_15.h   | 1083 --
 3rdparty/libiconv/1.14/lib/cns11643_2.h| 1112 --
 3rdparty/libiconv/1.14/lib/cns11643_3.h|  974 --
 3rdparty/libiconv/1.14/lib/cns11643_4.h|   61 -
 3rdparty/libiconv/1.14/lib/cns11643_4a.h   |  460 -
 3rdparty/libiconv/1.14/lib/cns11643_4b.h   |  668 -
 3rdparty/libiconv/1.14/lib/cns11643_5.h| 1278 --
 3rdparty/libiconv/1.14/lib/cns11643_6.h|  968 --
 3rdparty/libiconv/1.14/lib/cns11643_7.h|  988 --
 3rdparty/libiconv/1.14/lib/cns11643_inv.h  |15412 
 3rdparty/libiconv/1.14/lib/converters.h|  298 -
 3rdparty/libiconv/1.14/lib/cp1046.h|  157 -
 3rdparty/libiconv/1.14/lib/cp1124.h|  102 -
 3rdparty/libiconv/1.14/lib/cp1125.h|  129 -
 3rdparty/libiconv/1.14/lib/cp1129.h|  121 -
 3rdparty/libiconv/1.14/lib/cp1131.h|  132 -
 3rdparty/libiconv/1.14/lib/cp1133.h|  110 -
 3rdparty/libiconv/1.14/lib/cp1161.h|   89 -
 3rdparty/libiconv/1.14/lib/cp1162.h|   70 -
 3rdparty/libiconv/1.14/lib/cp1163.h|   63 -
 3rdparty/libiconv/1.14/lib/cp1250.h|  139 -
 3rdparty/libiconv/1.14/lib/cp1251.h|  131 -
 3rdparty/libiconv/1.14/lib/cp1252.h|  103 -
 3rdparty/libiconv/1.14/lib/cp1253.h|  122 -
 3rdparty/libiconv/1.14/lib/cp1254.h|  146 -
 3rdparty/libiconv/1.14/lib/cp1255.h|  380 -
 3rdparty/libiconv/1.14/lib/cp1256.h

[LyX/master] UserGuide.lyx: accept and distribute recent changes (part 1/2)

[Uwe Stöhr]

commit c39d673d2fc38ee4a42575f61df20fc64f84ce0f
Author: Uwe Stöhr 
Date:   Wed Sep 13 00:55:51 2017 +0200

UserGuide.lyx: accept and distribute recent changes (part 1/2)

- Customization.lyx: fix a typo

 lib/doc/Changelog-UserGuide-LyX_23x.txt |2 +
 lib/doc/Customization.lyx   |2 +-
 lib/doc/UserGuide.lyx   |  699 ++
 lib/doc/de/UserGuide.lyx|  357 +---
 lib/doc/es/UserGuide.lyx|  360 +--
 lib/doc/fr/UserGuide.lyx| 1014 ++-
 lib/doc/ja/UserGuide.lyx|  315 ++-
 7 files changed, 979 insertions(+), 1770 deletions(-)

[LyX/2.3.x] UserGuide.lyx: accept and distribute recent changes (part 1/2)

[Uwe Stöhr]

commit 5a5f154a98e3711f04405061bf7722020584215c
Author: Uwe Stöhr 
Date:   Wed Sep 13 00:57:21 2017 +0200

UserGuide.lyx: accept and distribute recent changes (part 1/2)

- Customization.lyx: fix a typo

 lib/doc/Changelog-UserGuide-LyX_23x.txt |2 +
 lib/doc/Customization.lyx   |2 +-
 lib/doc/UserGuide.lyx   |  697 ++-
 lib/doc/de/UserGuide.lyx|  357 +++-
 lib/doc/es/UserGuide.lyx|  360 +++-
 lib/doc/fr/UserGuide.lyx|  387 --
 lib/doc/ja/UserGuide.lyx|  315 ---
 7 files changed, 691 insertions(+), 1429 deletions(-)

[LyX/2.3.x] UserGuide.lyx: accept and distribute more recent changes (part 2/3)

[Uwe Stöhr]

commit 3a6e18f53ab238c965672265bcf30c4fd20013c6
Author: Uwe Stöhr 
Date:   Thu Sep 14 01:00:32 2017 +0200

UserGuide.lyx: accept and distribute more recent changes (part 2/3)
---
 lib/doc/Changelog-UserGuide-LyX_23x.txt |3 +-
 lib/doc/UserGuide.lyx   |  259 ++--
 lib/doc/de/UserGuide.lyx|  406 +++
 lib/doc/es/UserGuide.lyx|  325 +
 lib/doc/fr/UserGuide.lyx|  323 
 lib/doc/ja/UserGuide.lyx|  325 +
 6 files changed, 1505 insertions(+), 136 deletions(-)

diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt 
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index 303ba4e..d1aecc2 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -5,7 +5,8 @@ Modified:
 first step (not G, not J):
 - sec. 3.7.3: changed sentences
 - sec. 3.9.1: new handling of dashes
-- sec. 3.9.3.2: section completely rewritten (not F)
+- sec. 3.9.2: new section
+- sec. 3.9.4.2: section completely rewritten (not F)
 - sec. 6.1: new reference format and new options (not F)
 - sec. 6.5: section and its subsections completely rewritten
 - sec. 6.8: new feature "inverted branches" (not F)
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 1002501..cabffd9 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8337,12 +8337,14 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 The following 2 lines are empty:
 \end_layout
 
@@ -8355,6 +8357,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8378,6 +8381,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -16480,13 +16484,9 @@ literal "false"
 \end_inset
 
 .
-\change_inserted -1402925745 1504710179
-
 \end_layout
 
-\begin_layout Subsubsection
-
-\change_inserted -1402925745 1503938327
+\begin_layout Subsection
 Dashes and line breaks
 \begin_inset CommandInset label
 LatexCommand label
@@ -16498,45 +16498,25 @@ name "subsec:Dashes-and-line-breaks"
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1504686237
 Whether line breaks before or after dashes are allowed depends on the use
  case and locale:
 \end_layout
 
 \begin_layout Itemize
-
-\change_inserted -1402925745 1504302249
 No line breaks are allowed in ranges of values like A–Z or 1975–1982.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Itemize
-
-\change_inserted -1402925745 1504537660
 In English, lines may break after dashes used to set off parenthetical 
statement
 s.
 \end_layout
 
 \begin_layout Itemize
-
-\change_inserted -1402925745 1504678633
 In French and Spanish, dashes around parenthetical statements are treated
- similar to quote signs and line breaks are not allowed on the 
-\begin_inset Quotes eld
-\end_inset
-
-inner side
-\begin_inset Quotes erd
-\end_inset
-
-.
+ similar to quote signs and line breaks are not allowed on the left side.
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1504711768
 When using spaced en dashes
 \begin_inset space ~
 \end_inset
@@ -16545,16 +16525,14 @@ When using spaced en dashes
 \begin_inset space ~
 \end_inset
 
-- prevent line breaks before the dash with protected spaces.
+- line breaks before the dash with protected spaces are not allowed.
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1504686608
 When using em dashes without spaces—\SpecialChar allowbreak
 common in American English—\SpecialChar allowbreak
-insert optional
- line breaks with 
+one can insert
+ optional line breaks with the menu 
 \family sans
 Insert\SpecialChar menuseparator
 Formatting\SpecialChar menuseparator
@@ -16564,9 +16542,8 @@ Optional line break
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1504708653
-For documents containing many em dashes, you may consider to select 
+For documents containing many em dashes, you may consider to select the
+ option 
 \family sans
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
@@ -16574,7 +16551,7 @@ Fonts\SpecialChar menuseparator
 Output en- and em-dashes as ligatures.
  
 \family default
-This forces output of dashes as 
+This forces the output of dashes as 
 \begin_inset Quotes eld
 \end_inset
 
@@ -16590,42 +16567,62 @@ This forces output of dashes as
 \begin_inset Quotes erd
 \end_inset
 
- when exporting to LaTeX.
- The TeX font ligature mechanism convertes them to dash characters followed
+ when exporting to \SpecialChar LaTeX
+.
+ The \SpecialChar TeX
+ font ligature mechanism converts them to dash characters followed
  by an optional line break.
 \end_layout
 
 \begin_layout Standard
-
-\cha

[LyX/master] UserGuide.lyx: accept and distribute more recent changes (part 2/3)

[Uwe Stöhr]

commit 7ff051f9e7937b421d338bfe6b698cee0484403f
Author: Uwe Stöhr 
Date:   Thu Sep 14 01:02:50 2017 +0200

UserGuide.lyx: accept and distribute more recent changes (part 2/3)
---
 lib/doc/Changelog-UserGuide-LyX_23x.txt |3 +-
 lib/doc/UserGuide.lyx   |  259 ++--
 lib/doc/de/UserGuide.lyx|  406 +++
 lib/doc/es/UserGuide.lyx|  325 +
 lib/doc/fr/UserGuide.lyx|  323 
 lib/doc/ja/UserGuide.lyx|  325 +
 6 files changed, 1505 insertions(+), 136 deletions(-)

diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt 
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index 303ba4e..d1aecc2 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -5,7 +5,8 @@ Modified:
 first step (not G, not J):
 - sec. 3.7.3: changed sentences
 - sec. 3.9.1: new handling of dashes
-- sec. 3.9.3.2: section completely rewritten (not F)
+- sec. 3.9.2: new section
+- sec. 3.9.4.2: section completely rewritten (not F)
 - sec. 6.1: new reference format and new options (not F)
 - sec. 6.5: section and its subsections completely rewritten
 - sec. 6.8: new feature "inverted branches" (not F)
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 1002501..cabffd9 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8337,12 +8337,14 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 The following 2 lines are empty:
 \end_layout
 
@@ -8355,6 +8357,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8378,6 +8381,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -16480,13 +16484,9 @@ literal "false"
 \end_inset
 
 .
-\change_inserted -1402925745 1504710179
-
 \end_layout
 
-\begin_layout Subsubsection
-
-\change_inserted -1402925745 1503938327
+\begin_layout Subsection
 Dashes and line breaks
 \begin_inset CommandInset label
 LatexCommand label
@@ -16498,45 +16498,25 @@ name "subsec:Dashes-and-line-breaks"
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1504686237
 Whether line breaks before or after dashes are allowed depends on the use
  case and locale:
 \end_layout
 
 \begin_layout Itemize
-
-\change_inserted -1402925745 1504302249
 No line breaks are allowed in ranges of values like A–Z or 1975–1982.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Itemize
-
-\change_inserted -1402925745 1504537660
 In English, lines may break after dashes used to set off parenthetical 
statement
 s.
 \end_layout
 
 \begin_layout Itemize
-
-\change_inserted -1402925745 1504678633
 In French and Spanish, dashes around parenthetical statements are treated
- similar to quote signs and line breaks are not allowed on the 
-\begin_inset Quotes eld
-\end_inset
-
-inner side
-\begin_inset Quotes erd
-\end_inset
-
-.
+ similar to quote signs and line breaks are not allowed on the left side.
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1504711768
 When using spaced en dashes
 \begin_inset space ~
 \end_inset
@@ -16545,16 +16525,14 @@ When using spaced en dashes
 \begin_inset space ~
 \end_inset
 
-- prevent line breaks before the dash with protected spaces.
+- line breaks before the dash with protected spaces are not allowed.
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1504686608
 When using em dashes without spaces—\SpecialChar allowbreak
 common in American English—\SpecialChar allowbreak
-insert optional
- line breaks with 
+one can insert
+ optional line breaks with the menu 
 \family sans
 Insert\SpecialChar menuseparator
 Formatting\SpecialChar menuseparator
@@ -16564,9 +16542,8 @@ Optional line break
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1504708653
-For documents containing many em dashes, you may consider to select 
+For documents containing many em dashes, you may consider to select the
+ option 
 \family sans
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
@@ -16574,7 +16551,7 @@ Fonts\SpecialChar menuseparator
 Output en- and em-dashes as ligatures.
  
 \family default
-This forces output of dashes as 
+This forces the output of dashes as 
 \begin_inset Quotes eld
 \end_inset
 
@@ -16590,42 +16567,62 @@ This forces output of dashes as
 \begin_inset Quotes erd
 \end_inset
 
- when exporting to LaTeX.
- The TeX font ligature mechanism convertes them to dash characters followed
+ when exporting to \SpecialChar LaTeX
+.
+ The \SpecialChar TeX
+ font ligature mechanism converts them to dash characters followed
  by an optional line break.
 \end_layout
 
 \begin_layout Standard
-
-\cha

[LyX/master] UserGuide.lyx: accept and distribute all recent changes (part 3/3)

[Uwe Stöhr]

commit 0ae02d0c9b9ffc908a5a35f025abce11575a
Author: Uwe Stöhr 
Date:   Fri Sep 15 00:08:05 2017 +0200

UserGuide.lyx: accept and distribute all recent changes (part 3/3)
---
 lib/doc/Changelog-UserGuide-LyX_23x.txt |1 +
 lib/doc/UserGuide.lyx   |  146 +--
 lib/doc/de/UserGuide.lyx|  133 ++---
 lib/doc/es/UserGuide.lyx|  140 --
 lib/doc/fr/UserGuide.lyx|  138 -
 lib/doc/ja/UserGuide.lyx|  134 +++-
 6 files changed, 501 insertions(+), 191 deletions(-)

diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt 
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index d1aecc2..fcc2137 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -10,6 +10,7 @@ first step (not G, not J):
 - sec. 6.1: new reference format and new options (not F)
 - sec. 6.5: section and its subsections completely rewritten
 - sec. 6.8: new feature "inverted branches" (not F)
+- sec. A.4.3 new menu
 - sec. B.12 new sentences (not F)
 - sec. C.1.2.3 new sentence (not F)
 
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index cabffd9..639ca6f 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -140,12 +140,11 @@ enumitem
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -1402925745 "Günter Milde"
 \end_header
 
 \begin_body
@@ -16617,7 +16616,7 @@ nobreakdash
 \end_layout
 
 \begin_deeper
-\begin_layout Quote
+\begin_layout Itemize
 Pages
 \begin_inset space ~
 \end_inset
@@ -16650,8 +16649,7 @@ status open
 
 \end_layout
 
-\begin_deeper
-\begin_layout Standard
+\begin_layout Itemize
 
 \lang french
 Les incises 
@@ -16692,8 +16690,7 @@ même
 – sont très utiles.
 \end_layout
 
-\end_deeper
-\begin_layout Quote
+\begin_layout Itemize
 
 \lang spanish
 En una frase 
@@ -16773,32 +16770,20 @@ typewriter
 
 \begin_layout Enumerate
 Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
-\change_inserted -1402925745 1504003612
-
 \end_layout
 
 \begin_layout Standard
+In \SpecialChar LyX
 
-\change_inserted -1402925745 1504709020
-Changes:
-\end_layout
-
-\begin_layout Labeling
-\labelwidthstring 00.00.
-\SpecialChar LyX
+\begin_inset space ~
+\end_inset
 
-\change_inserted -1402925745 1504711065
+2.2 -- and --- were in \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.2 -- and --- 
-\change_unchanged
-in LyX are o
-\change_inserted -1402925745 1504711065
-utput as -{}- and -{}-{}- to prevent ligation to dashes.
-\change_unchanged
-
+2.3 output as -{}- and -{}-{}- to prevent ligation to dashes.
 \begin_inset Foot
 status collapsed
 
@@ -16816,111 +16801,65 @@ Up to \SpecialChar LyX
 
 \end_inset
 
- Occurrences 
-\change_inserted -1402925745 1504711065
-in older documents are converted to literal Unicode dashe
-\change_unchanged
-s.
-\change_inserted -1402925745 1504711065
-
-\end_layout
-
-\begin_deeper
-\begin_layout Itemize
-
-\change_inserted -1402925745 1504709468
-In some cases this leads to different line breaks.
-\end_layout
-
-\begin_layout Itemize
-
-\change_inserted -1402925745 1504710005
-It is no longer possible to differentiate dashes with/without optional line
- break using --- and -- vs.
- literal dashes.
- Either convert one sort t
-\change_unchanged
-o \SpecialChar TeX
- code 
-\change_inserted -1402925745 1504710005
-or insert optional line break characters.
-\change_unchanged
-
-\end_layout
-
-\end_deeper
-\begin_layout Labeling
-\labelwidthstring 00.00.
-\SpecialChar LyX
-
-\change_inserted -1402925745 1504710385
+ Occurrences in older documents are converted to literal Unicode dashes.
+ This lead to problems like different line breaks.
+ Since \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.3 New
-\change_unchanged
- option 
-\change_inserted -1402925745 1504710385
-
+2.3 there is the option 
+\family sans
+Output en- and em-dashes as ligatures
+\family default
+ in the menu 
 \family sans
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
-Fonts\SpecialChar menuseparator
-Output en- and em-dashes as ligatures.
+Fonts.
 
 \family default
- It is on by default but unselected when opening documents edited with 
-\change_unchanged
-\SpecialChar LyX
+ It is on by default but unselected when opening documents edited with 
\SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-
-\change_inserted -1402925745 1504710385
 2.2.
- 
+\begin_inset Newline newline
+\end_inset
+
+Note the following side-effects of the \SpecialChar LyX
+ dash handling:
 \end_layout
 
-\begin_deeper
 \begin_layout Itemize
+If you used literal em- and en dashes in pre-\SpecialChar LyX
 
-\change_inserted -1402925745 1504712456
-If you use

[LyX/2.3.x] UserGuide.lyx: accept and distribute all recent changes (part 3/3)

[Uwe Stöhr]

commit 4348166d8bc9c56461e2d0d56f533f311ff66274
Author: Uwe Stöhr 
Date:   Fri Sep 15 00:09:40 2017 +0200

UserGuide.lyx: accept and distribute all recent changes (part 3/3)
---
 lib/doc/Changelog-UserGuide-LyX_23x.txt |1 +
 lib/doc/UserGuide.lyx   |  146 +--
 lib/doc/de/UserGuide.lyx|  133 ++---
 lib/doc/es/UserGuide.lyx|  140 --
 lib/doc/fr/UserGuide.lyx|  138 -
 lib/doc/ja/UserGuide.lyx|  134 +++-
 6 files changed, 501 insertions(+), 191 deletions(-)

diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt 
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index d1aecc2..fcc2137 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -10,6 +10,7 @@ first step (not G, not J):
 - sec. 6.1: new reference format and new options (not F)
 - sec. 6.5: section and its subsections completely rewritten
 - sec. 6.8: new feature "inverted branches" (not F)
+- sec. A.4.3 new menu
 - sec. B.12 new sentences (not F)
 - sec. C.1.2.3 new sentence (not F)
 
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index cabffd9..639ca6f 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -140,12 +140,11 @@ enumitem
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -1402925745 "Günter Milde"
 \end_header
 
 \begin_body
@@ -16617,7 +16616,7 @@ nobreakdash
 \end_layout
 
 \begin_deeper
-\begin_layout Quote
+\begin_layout Itemize
 Pages
 \begin_inset space ~
 \end_inset
@@ -16650,8 +16649,7 @@ status open
 
 \end_layout
 
-\begin_deeper
-\begin_layout Standard
+\begin_layout Itemize
 
 \lang french
 Les incises 
@@ -16692,8 +16690,7 @@ même
 – sont très utiles.
 \end_layout
 
-\end_deeper
-\begin_layout Quote
+\begin_layout Itemize
 
 \lang spanish
 En una frase 
@@ -16773,32 +16770,20 @@ typewriter
 
 \begin_layout Enumerate
 Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
-\change_inserted -1402925745 1504003612
-
 \end_layout
 
 \begin_layout Standard
+In \SpecialChar LyX
 
-\change_inserted -1402925745 1504709020
-Changes:
-\end_layout
-
-\begin_layout Labeling
-\labelwidthstring 00.00.
-\SpecialChar LyX
+\begin_inset space ~
+\end_inset
 
-\change_inserted -1402925745 1504711065
+2.2 -- and --- were in \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.2 -- and --- 
-\change_unchanged
-in LyX are o
-\change_inserted -1402925745 1504711065
-utput as -{}- and -{}-{}- to prevent ligation to dashes.
-\change_unchanged
-
+2.3 output as -{}- and -{}-{}- to prevent ligation to dashes.
 \begin_inset Foot
 status collapsed
 
@@ -16816,111 +16801,65 @@ Up to \SpecialChar LyX
 
 \end_inset
 
- Occurrences 
-\change_inserted -1402925745 1504711065
-in older documents are converted to literal Unicode dashe
-\change_unchanged
-s.
-\change_inserted -1402925745 1504711065
-
-\end_layout
-
-\begin_deeper
-\begin_layout Itemize
-
-\change_inserted -1402925745 1504709468
-In some cases this leads to different line breaks.
-\end_layout
-
-\begin_layout Itemize
-
-\change_inserted -1402925745 1504710005
-It is no longer possible to differentiate dashes with/without optional line
- break using --- and -- vs.
- literal dashes.
- Either convert one sort t
-\change_unchanged
-o \SpecialChar TeX
- code 
-\change_inserted -1402925745 1504710005
-or insert optional line break characters.
-\change_unchanged
-
-\end_layout
-
-\end_deeper
-\begin_layout Labeling
-\labelwidthstring 00.00.
-\SpecialChar LyX
-
-\change_inserted -1402925745 1504710385
+ Occurrences in older documents are converted to literal Unicode dashes.
+ This lead to problems like different line breaks.
+ Since \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.3 New
-\change_unchanged
- option 
-\change_inserted -1402925745 1504710385
-
+2.3 there is the option 
+\family sans
+Output en- and em-dashes as ligatures
+\family default
+ in the menu 
 \family sans
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
-Fonts\SpecialChar menuseparator
-Output en- and em-dashes as ligatures.
+Fonts.
 
 \family default
- It is on by default but unselected when opening documents edited with 
-\change_unchanged
-\SpecialChar LyX
+ It is on by default but unselected when opening documents edited with 
\SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-
-\change_inserted -1402925745 1504710385
 2.2.
- 
+\begin_inset Newline newline
+\end_inset
+
+Note the following side-effects of the \SpecialChar LyX
+ dash handling:
 \end_layout
 
-\begin_deeper
 \begin_layout Itemize
+If you used literal em- and en dashes in pre-\SpecialChar LyX
 
-\change_inserted -1402925745 1504712456
-If you use

[LyX/2.2.x] Win installer: update to Python 2.7.14 for LyX 2.2.4

[Uwe Stöhr]

commit 8631fa68a524e65e2e13666452f504576c845f34
Author: Uwe Stöhr 
Date:   Sun Oct 1 23:21:38 2017 +0200

Win installer: update to Python 2.7.14 for LyX 2.2.4
---
 .../Win32/packaging/installer/ChangeLog.txt|1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/development/Win32/packaging/installer/ChangeLog.txt 
b/development/Win32/packaging/installer/ChangeLog.txt
index 08714b7..ec18b0c 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -3,6 +3,7 @@
 - updated to MiKTeX 2.9 build 6361
 - updated to ImageMagick 7.0.6-2
 - updated to Perl 5.24.2.1
+- updated to Python 2.7.14
 
 
 Changelog for LyX-223-1:

[LyX/master] UserGuide.lyx: accept and distribute today's changes

[Uwe Stöhr]

commit 7ee30e0f5a267aee96958ecc91d2be1a7397de87
Author: Uwe Stöhr 
Date:   Tue Oct 3 01:15:32 2017 +0200

UserGuide.lyx: accept and distribute today's changes
---
 lib/doc/UserGuide.lyx|  162 +++---
 lib/doc/de/UserGuide.lyx |  407 --
 lib/doc/es/UserGuide.lyx |  149 -
 lib/doc/fr/UserGuide.lyx |  149 -
 lib/doc/ja/UserGuide.lyx |  143 +++-
 5 files changed, 653 insertions(+), 357 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 639ca6f..188a16d 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8336,14 +8336,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -8356,7 +8354,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8380,7 +8377,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -12696,7 +12692,7 @@ status open
 Note:
 \series default
  In practice, some fonts might fail due to a legacy (non Unicode) font 
encoding,
- bad metrics, and other font deficiencies; so you might have to experiment.
+ bad metrics, or other font deficiencies; so you might have to experiment.
 \end_layout
 
 \end_inset
@@ -16094,7 +16090,7 @@ In \SpecialChar LyX
 \begin_inset Quotes erd
 \end_inset
 
- character comes in four variants: the 
+ symbol comes in four variants: the 
 \emph on
 hyphen
 \emph default
@@ -16242,15 +16238,31 @@ status collapsed
 \begin_layout Plain Layout
 On Mac and Linux, the en dash is entered with 
 \family sans
-Option-hyphen
+Opt+
+\begin_inset Quotes eld
+\end_inset
+
+-
+\begin_inset Quotes erd
+\end_inset
+
+
 \family default
  and the em dash with 
 \family sans
-Shift-Option-hyphen
+Shift-Opt+
+\begin_inset Quotes erd
+\end_inset
+
+-
+\begin_inset Quotes erd
+\end_inset
+
+
 \family default
  (
 \family sans
-Option
+Opt
 \family default
  is the Mac label for the right 
 \family sans
@@ -16280,8 +16292,8 @@ unicode-insert
 \end_inset
 
  \SpecialChar LyX
- function with the Unicode code as argument (2013 for the em dash and 2014
- for the en dash).
+ function with the Unicode code point as argument (2013 for the em dash
+ and 2014 for the en dash).
 \end_layout
 
 \end_inset
@@ -16397,6 +16409,29 @@ minus sign
 \end_layout
 
 \begin_layout Standard
+Dashes can also be inserted with 
+\family sans
+Insert\SpecialChar menuseparator
+Special
+\begin_inset space ~
+\end_inset
+
+Character\SpecialChar menuseparator
+Symbols
+\family default
+ or the 
+\begin_inset Quotes eld
+\end_inset
+
+unicode-insert
+\begin_inset Quotes erd
+\end_inset
+
+ \SpecialChar LyX
+ function.
+\end_layout
+
+\begin_layout Standard
 Hyphen and dashes are distinct from the minus sign, which appears in math
  mode and has a length of its own.
  Here are some examples:
@@ -16431,20 +16466,6 @@ en dash
 \end_layout
 
 \begin_layout Enumerate
-Dashes indicate interruptions, performing a function related to – but subtly
- different from – parentheses.
-\begin_inset space \hfill{}
-\end_inset
-
-(
-\emph on
-en dash
-\emph default
-)
-\end_layout
-
-\begin_deeper
-\begin_layout Standard
 The em dash is used without spaces: Oh—there's a dash.
 \begin_inset space \hfill{}
 \end_inset
@@ -16456,7 +16477,6 @@ em dash
 )
 \end_layout
 
-\end_deeper
 \begin_layout Enumerate
 \begin_inset Formula $x^{2}-y^{2}=z^{2}$
 \end_inset
@@ -16497,8 +16517,8 @@ name "subsec:Dashes-and-line-breaks"
 \end_layout
 
 \begin_layout Standard
-Whether line breaks before or after dashes are allowed depends on the use
- case and locale:
+Whether line breaks around dashes are allowed depends on the use case and
+ locale:
 \end_layout
 
 \begin_layout Itemize
@@ -16506,13 +16526,13 @@ No line breaks are allowed in ranges of values like 
A–Z or 1975–1982.
 \end_layout
 
 \begin_layout Itemize
-In English, lines may break after dashes used to set off parenthetical 
statement
-s.
+In English, dashes used to set off parenthetical statements should not start
+ a new line.
 \end_layout
 
 \begin_layout Itemize
 In French and Spanish, dashes around parenthetical statements are treated
- similar to quote signs and line breaks are not allowed on the left side.
+ similar to brackets: line breaks are not allowed on the inner side.
 \end_layout
 
 \begin_layout Standard
@@ -16524,7 +16544,7 @@ When using spaced en dashes
 \begin_inset space ~
 \end_inset
 
-- line breaks before the dash with protected spaces are not allowed.
+- line breaks before the dash can be prevented with protected spaces.
 \end_layout
 
 \begin_layout Standard
@@ -16574,7 +16594,7 @@ This forces the output of dashes as
 \end_layout
 
 \begin_layout Standard
-Subtleties:
+Caution:
 \end_layout
 
 \begin_layout Enumera

[LyX/2.3.x] UserGuide.lyx: accept and distribute today's changes

[Uwe Stöhr]

commit dc29f73a2fcda3ebd2f7f34b7308b6aa20b29303
Author: Uwe Stöhr 
Date:   Tue Oct 3 01:30:59 2017 +0200

UserGuide.lyx: accept and distribute today's changes

 lib/doc/UserGuide.lyx|  333 +++
 lib/doc/de/UserGuide.lyx |  689 +-
 lib/doc/es/UserGuide.lyx |  149 +++---
 lib/doc/fr/UserGuide.lyx |  149 +++---
 lib/doc/ja/UserGuide.lyx |  143 +++---
 5 files changed, 411 insertions(+), 1052 deletions(-)