[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 two is 

[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,14 @@ none
 \noun off
 \color 

[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,14 @@ none
 \noun off
 \color 

[LyX/master] Fix #10760

[Juergen Spitzmueller]

commit 4c62e25ed63b357b1780f93d12335879d55a14c8
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 19:43:27 2017 +0200

Fix #10760
---
 lib/lyx2lyx/lyx_2_3.py |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index 73ac45c..edc5b1f 100644
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -1996,7 +1996,8 @@ def revert_mathindent(document):
 i = find_re(document.header, regexp, 0)
 if i != -1:
 value = get_value(document.header, "\\math_indentation" , i).split()[0]
-add_to_preamble(document, ["\\setlength{\\mathindent}{" + value + '}'])
+if value != "default":
+add_to_preamble(document, ["\\setlength{\\mathindent}{" + value + 
'}'])
 del document.header[i]
 # now set the document class option
 regexp = re.compile(r'(\\is_math_indent 1)')

[LyX/2.3.x] Fix #10760

[Juergen Spitzmueller]

commit 96cd45a9a804ea3c1991506fc3732b708cfb2992
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 19:43:27 2017 +0200

Fix #10760
---
 lib/lyx2lyx/lyx_2_3.py |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index 73ac45c..edc5b1f 100644
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -1996,7 +1996,8 @@ def revert_mathindent(document):
 i = find_re(document.header, regexp, 0)
 if i != -1:
 value = get_value(document.header, "\\math_indentation" , i).split()[0]
-add_to_preamble(document, ["\\setlength{\\mathindent}{" + value + '}'])
+if value != "default":
+add_to_preamble(document, ["\\setlength{\\mathindent}{" + value + 
'}'])
 del document.header[i]
 # now set the document class option
 regexp = re.compile(r'(\\is_math_indent 1)')

[LyX/master] Inkscape.xtemplate: Add missing output formats

[Juergen Spitzmueller]

commit 4f341fc59dc755bbf5564567acd682ad9502410d
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 18:07:05 2017 +0200

Inkscape.xtemplate: Add missing output formats
---
 lib/xtemplates/inkscape.xtemplate |   16 
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/lib/xtemplates/inkscape.xtemplate 
b/lib/xtemplates/inkscape.xtemplate
index 867800f..e4fc14d 100644
--- a/lib/xtemplates/inkscape.xtemplate
+++ b/lib/xtemplates/inkscape.xtemplate
@@ -75,5 +75,21 @@ Template Inkscape
ReferencedFile latex "$$AbsPath$$Basename.eps"
ReferencedFile dvi   "$$AbsPath$$Basename.eps"
FormatEnd
+   Format Ascii
+   Product "[InkscapeGraphics: $$FName]"
+   FormatEnd
+   Format DocBook
+   Product ""
+   UpdateFormat eps
+   UpdateResult "$$AbsPath$$Basename.eps"
+   ReferencedFile docbook "$$AbsPath$$Basename.eps"
+   ReferencedFile docbook-xml "$$AbsPath$$Basename.eps"
+   FormatEnd
+   Format XHTML
+   Product ""
+   UpdateFormat svg
+   UpdateResult "$$AbsPath$$Basename.svg"
+   ReferencedFile xhtml "$$AbsPath$$Basename.svg"
+   FormatEnd
 TemplateEnd
 

[LyX/2.3.x] Inkscape.xtemplate: Add missing output formats

[Juergen Spitzmueller]

commit 5b28d029ad4a7c64ff7098f7376d022c8844e9c9
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 18:07:05 2017 +0200

Inkscape.xtemplate: Add missing output formats
---
 lib/xtemplates/inkscape.xtemplate |   16 
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/lib/xtemplates/inkscape.xtemplate 
b/lib/xtemplates/inkscape.xtemplate
index 867800f..e4fc14d 100644
--- a/lib/xtemplates/inkscape.xtemplate
+++ b/lib/xtemplates/inkscape.xtemplate
@@ -75,5 +75,21 @@ Template Inkscape
ReferencedFile latex "$$AbsPath$$Basename.eps"
ReferencedFile dvi   "$$AbsPath$$Basename.eps"
FormatEnd
+   Format Ascii
+   Product "[InkscapeGraphics: $$FName]"
+   FormatEnd
+   Format DocBook
+   Product ""
+   UpdateFormat eps
+   UpdateResult "$$AbsPath$$Basename.eps"
+   ReferencedFile docbook "$$AbsPath$$Basename.eps"
+   ReferencedFile docbook-xml "$$AbsPath$$Basename.eps"
+   FormatEnd
+   Format XHTML
+   Product ""
+   UpdateFormat svg
+   UpdateResult "$$AbsPath$$Basename.svg"
+   ReferencedFile xhtml "$$AbsPath$$Basename.svg"
+   FormatEnd
 TemplateEnd
 

[LyX/master] configure.py: update lyxrc file format.

[Juergen Spitzmueller]

commit 6dd66a15a5806e2bda59f5a65920a15d2821c8e1
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 17:19:12 2017 +0200

configure.py: update lyxrc file format.
---
 lib/configure.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index ec03319..a674032 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1772,7 +1772,7 @@ if __name__ == '__main__':
 lyx_check_config = True
 lyx_kpsewhich = True
 outfile = 'lyxrc.defaults'
-lyxrc_fileformat = 23
+lyxrc_fileformat = 24
 rc_entries = ''
 lyx_keep_temps = False
 version_suffix = ''

[LyX/2.3.x] configure.py: update lyxrc format.

[Juergen Spitzmueller]

commit 6dd1d6ec357b668c4f349658403630aea61b8bdd
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 17:14:36 2017 +0200

configure.py: update lyxrc format.
---
 lib/configure.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index bda55dd..ec03319 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1772,7 +1772,7 @@ if __name__ == '__main__':
 lyx_check_config = True
 lyx_kpsewhich = True
 outfile = 'lyxrc.defaults'
-lyxrc_fileformat = 22
+lyxrc_fileformat = 23
 rc_entries = ''
 lyx_keep_temps = False
 version_suffix = ''

[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] 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/master] svg2*tex.py: use subprocess in order to handle path with spaces.

[Juergen Spitzmueller]

commit 90df39d491dfd72f0cd40dcda1b94b2df676936e
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 17:02:58 2017 +0200

svg2*tex.py: use subprocess in order to handle path with spaces.

See #10679
---
 lib/scripts/svg2pdftex.py |6 +++---
 lib/scripts/svg2pstex.py  |7 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/scripts/svg2pdftex.py b/lib/scripts/svg2pdftex.py
index 06b5428..56ac22e 100644
--- a/lib/scripts/svg2pdftex.py
+++ b/lib/scripts/svg2pdftex.py
@@ -27,13 +27,13 @@
 #   the real PDF file would be overwritten by a TeX file named outputfile.pdf.
 #
 
-import os, sys, re
+import os, sys, re, subprocess
 
 def runCommand(cmd):
 ''' Utility function:
 run a command, quit if fails
 '''
-if os.system(cmd) != 0:
+if subprocess.call(cmd) != 0:
 print "Command '%s' fails." % cmd
 sys.exit(1)
 
@@ -65,7 +65,7 @@ OutBase = os.path.splitext(OutputFile)[0]
 # while outsourcing the text to a LaTeX file ${OutBase}.pdf_tex which includes 
and overlays
 # the PDF image and can be \input to LaTeX files. We rename the latter file to 
${OutputFile}
 # (although this is probably the name it already has).
-runCommand('%s --file=%s --export-pdf=%s.pdf --export-latex' % (InkscapeCmd, 
InputFile, OutBase))
+runCommand([InkscapeCmd, '--file=%s' % (InputFile), '--export-pdf=%s.pdf' % 
(OutBase), '--export-latex'])
 
 os.rename('%s.pdf_tex' % OutBase, OutputFile)
 
diff --git a/lib/scripts/svg2pstex.py b/lib/scripts/svg2pstex.py
index 238afb6..246537b 100644
--- a/lib/scripts/svg2pstex.py
+++ b/lib/scripts/svg2pstex.py
@@ -30,13 +30,13 @@
 # This script converts an SVG image to something that latex can process
 # into high quality PostScript.
 
-import os, sys
+import os, sys, re, subprocess
 
 def runCommand(cmd):
 ''' Utility function:
 run a command, quit if fails
 '''
-if os.system(cmd) != 0:
+if subprocess.call(cmd) != 0:
 print "Command '%s' fails." % cmd
 sys.exit(1)
 
@@ -68,6 +68,7 @@ OutBase = os.path.splitext(OutputFile)[0]
 # while outsourcing the text to a LaTeX file ${OutBase}.eps_tex which includes 
and overlays
 # the EPS image and can be \input to LaTeX files. We rename the latter file to 
${OutputFile}
 # (although this is probably the name it already has).
-runCommand('%s --file=%s --export-eps=%s.eps --export-latex' % (InkscapeCmd, 
InputFile, OutBase))
+runCommand([InkscapeCmd, '--file=%s' % (InputFile), '--export-eps=%s.eps' % 
(OutBase), '--export-latex'])
+
 os.rename('%s.eps_tex' % OutBase, OutputFile)
 

[LyX/2.3.x] svg2*tex.py: use subprocess in order to handle path with spaces.

[Juergen Spitzmueller]

commit 0b6207d771b8dcb0e845429a75c87c36d1230461
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 17:02:58 2017 +0200

svg2*tex.py: use subprocess in order to handle path with spaces.

See #10679
---
 lib/scripts/svg2pdftex.py |6 +++---
 lib/scripts/svg2pstex.py  |7 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/scripts/svg2pdftex.py b/lib/scripts/svg2pdftex.py
index 06b5428..56ac22e 100644
--- a/lib/scripts/svg2pdftex.py
+++ b/lib/scripts/svg2pdftex.py
@@ -27,13 +27,13 @@
 #   the real PDF file would be overwritten by a TeX file named outputfile.pdf.
 #
 
-import os, sys, re
+import os, sys, re, subprocess
 
 def runCommand(cmd):
 ''' Utility function:
 run a command, quit if fails
 '''
-if os.system(cmd) != 0:
+if subprocess.call(cmd) != 0:
 print "Command '%s' fails." % cmd
 sys.exit(1)
 
@@ -65,7 +65,7 @@ OutBase = os.path.splitext(OutputFile)[0]
 # while outsourcing the text to a LaTeX file ${OutBase}.pdf_tex which includes 
and overlays
 # the PDF image and can be \input to LaTeX files. We rename the latter file to 
${OutputFile}
 # (although this is probably the name it already has).
-runCommand('%s --file=%s --export-pdf=%s.pdf --export-latex' % (InkscapeCmd, 
InputFile, OutBase))
+runCommand([InkscapeCmd, '--file=%s' % (InputFile), '--export-pdf=%s.pdf' % 
(OutBase), '--export-latex'])
 
 os.rename('%s.pdf_tex' % OutBase, OutputFile)
 
diff --git a/lib/scripts/svg2pstex.py b/lib/scripts/svg2pstex.py
index 238afb6..246537b 100644
--- a/lib/scripts/svg2pstex.py
+++ b/lib/scripts/svg2pstex.py
@@ -30,13 +30,13 @@
 # This script converts an SVG image to something that latex can process
 # into high quality PostScript.
 
-import os, sys
+import os, sys, re, subprocess
 
 def runCommand(cmd):
 ''' Utility function:
 run a command, quit if fails
 '''
-if os.system(cmd) != 0:
+if subprocess.call(cmd) != 0:
 print "Command '%s' fails." % cmd
 sys.exit(1)
 
@@ -68,6 +68,7 @@ OutBase = os.path.splitext(OutputFile)[0]
 # while outsourcing the text to a LaTeX file ${OutBase}.eps_tex which includes 
and overlays
 # the EPS image and can be \input to LaTeX files. We rename the latter file to 
${OutputFile}
 # (although this is probably the name it already has).
-runCommand('%s --file=%s --export-eps=%s.eps --export-latex' % (InkscapeCmd, 
InputFile, OutBase))
+runCommand([InkscapeCmd, '--file=%s' % (InputFile), '--export-eps=%s.eps' % 
(OutBase), '--export-latex'])
+
 os.rename('%s.eps_tex' % OutBase, OutputFile)
 

[LyX/master] Customization: update the list of colors.

[Juergen Spitzmueller]

commit 36b092cadd1d8b14f35e1b20c26db3659bb20ba8
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 16:10:38 2017 +0200

Customization: update the list of colors.
---
 lib/doc/Customization.lyx |  284 -
 1 files changed, 279 insertions(+), 5 deletions(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 42c42c9..4d9a9b9 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -124,11 +124,12 @@ logicalmkup
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
-\tracking_changes false
+\tracking_changes true
 \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
@@ -27583,9 +27584,46 @@ name "chap:Names-of-colors"
 \end_layout
 
 \begin_layout Standard
-The colors listed here are the standard colors and the those that you can
- adjust in the \SpecialChar LyX
+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
  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
 
 \begin_layout Description
@@ -27602,6 +27640,22 @@ none
 \noun off
 \color none
  No particular color – clear or default
+\change_inserted -712698321 1505049946
+
+\end_layout
+
+\begin_layout Section
+
+\change_inserted -712698321 1505048068
+Static colors
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted -712698321 1505048080
+These are fixed colors that cannot me customized:
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
@@ -27610,34 +27664,168 @@ black
 
 \begin_layout Description
 white
+\change_inserted -712698321 1505047780
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047787
+blue
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047791
+brown
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047799
+cyan
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047807
+darkgray
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047809
+gray
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
+
+\change_deleted -712698321 1505047820
 red
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
 green
+\change_inserted -712698321 1505047824
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047828
+lightgray
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
+
+\change_deleted -712698321 1505047798
 blue
 \end_layout
 
 \begin_layout Description
+
+\change_deleted -712698321 1505047798
 cyan
+\change_inserted -712698321 1505047834
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047835
+lime
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
 magenta
+\change_inserted -712698321 1505047840
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047846
+olive
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047850
+orange
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047861
+pink
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047863
+purple
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047867
+red
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047881
+teal
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047878
+violet
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
 yellow
+\change_inserted -712698321 1505047947
+
+\end_layout
+
+\begin_layout Section
+
+\change_inserted -712698321 1505048092
+Dynamic colors
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted -712698321 1505048589
+These are the colors allocated to specific elements in 
+\begin_inset Info
+type  "menu"
+arg   "dialog-show prefs"
+\end_inset
+
+:
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
-added_space Added space marker color
+added_space Added space 
+\change_deleted -712698321 1505049692
+marker 
+\change_unchanged
+color
 \end_layout
 
 \begin_layout Description
@@ -27662,6 +27850,16 @@ branchlabel Label color for branches
 
 \begin_layout Description
 

[LyX/master] de/Customization: finish translation.

[Juergen Spitzmueller]

commit 2fab61b5b3f1a6358bfceb17bbe7fb4a4534a91d
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 16:12:25 2017 +0200

de/Customization: finish translation.

 lib/doc/de/Customization.lyx | 3896 +++---
 1 files changed, 1747 insertions(+), 2149 deletions(-)

[LyX/2.3.x] de/Customization: finish translation.

[Juergen Spitzmueller]

commit 0a9f043fd42f7a7559a93773ba11bc55b2565883
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 16:12:25 2017 +0200

de/Customization: finish translation.

 lib/doc/de/Customization.lyx | 3896 +++---
 1 files changed, 1747 insertions(+), 2149 deletions(-)

[LyX/2.3.x] Customization: update the list of colors.

[Juergen Spitzmueller]

commit 1fc026aa4c793708f6be0d8955e92279e3fe896b
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 16:10:38 2017 +0200

Customization: update the list of colors.
---
 lib/doc/Customization.lyx |  284 -
 1 files changed, 279 insertions(+), 5 deletions(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 42c42c9..4d9a9b9 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -124,11 +124,12 @@ logicalmkup
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
-\tracking_changes false
+\tracking_changes true
 \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
@@ -27583,9 +27584,46 @@ name "chap:Names-of-colors"
 \end_layout
 
 \begin_layout Standard
-The colors listed here are the standard colors and the those that you can
- adjust in the \SpecialChar LyX
+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
  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
 
 \begin_layout Description
@@ -27602,6 +27640,22 @@ none
 \noun off
 \color none
  No particular color – clear or default
+\change_inserted -712698321 1505049946
+
+\end_layout
+
+\begin_layout Section
+
+\change_inserted -712698321 1505048068
+Static colors
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted -712698321 1505048080
+These are fixed colors that cannot me customized:
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
@@ -27610,34 +27664,168 @@ black
 
 \begin_layout Description
 white
+\change_inserted -712698321 1505047780
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047787
+blue
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047791
+brown
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047799
+cyan
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047807
+darkgray
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047809
+gray
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
+
+\change_deleted -712698321 1505047820
 red
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
 green
+\change_inserted -712698321 1505047824
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047828
+lightgray
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
+
+\change_deleted -712698321 1505047798
 blue
 \end_layout
 
 \begin_layout Description
+
+\change_deleted -712698321 1505047798
 cyan
+\change_inserted -712698321 1505047834
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047835
+lime
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
 magenta
+\change_inserted -712698321 1505047840
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047846
+olive
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047850
+orange
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047861
+pink
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047863
+purple
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047867
+red
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047881
+teal
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1505047878
+violet
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
 yellow
+\change_inserted -712698321 1505047947
+
+\end_layout
+
+\begin_layout Section
+
+\change_inserted -712698321 1505048092
+Dynamic colors
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted -712698321 1505048589
+These are the colors allocated to specific elements in 
+\begin_inset Info
+type  "menu"
+arg   "dialog-show prefs"
+\end_inset
+
+:
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
-added_space Added space marker color
+added_space Added space 
+\change_deleted -712698321 1505049692
+marker 
+\change_unchanged
+color
 \end_layout
 
 \begin_layout Description
@@ -27662,6 +27850,16 @@ branchlabel Label color for branches
 
 \begin_layout Description
 

[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/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: 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| 

[LyX/2.3.x] de.po

[Juergen Spitzmueller]

commit 8adb020cd20d56d7be662ce698764f8086292968
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 11:04:44 2017 +0200

de.po
---
 po/de.gmo |  Bin 539505 -> 539573 bytes
 po/de.po  |  316 +++--
 2 files changed, 160 insertions(+), 156 deletions(-)

diff --git a/po/de.gmo b/po/de.gmo
index e39cb86..4062f33 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index e44a3d7..40dd567 100644
--- a/po/de.po
+++ b/po/de.po
@@ -95,8 +95,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2017-09-09 09:07+0200\n"
-"PO-Revision-Date: 2017-09-09 09:13+0100\n"
+"POT-Creation-Date: 2017-09-10 11:00+0200\n"
+"PO-Revision-Date: 2017-09-10 11:02+0100\n"
 "Last-Translator: Juergen Spitzmueller \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -452,17 +452,17 @@ msgstr "Dieser Abschnitt des Literaturverzeichnisses 
enthält..."
 msgid ":"
 msgstr ":"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:185 src/frontends/qt4/GuiBibtex.cpp:338
+#: src/frontends/qt4/ui/BibtexUi.ui:185 src/frontends/qt4/GuiBibtex.cpp:343
 #: src/insets/InsetBibtex.cpp:223 src/insets/InsetBibtex.cpp:241
 msgid "all cited references"
 msgstr "alle zitierten Literatureinträge"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:190 src/frontends/qt4/GuiBibtex.cpp:340
+#: src/frontends/qt4/ui/BibtexUi.ui:190 src/frontends/qt4/GuiBibtex.cpp:345
 #: src/insets/InsetBibtex.cpp:221
 msgid "all uncited references"
 msgstr "alle nicht zitierten Literatureinträge"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:195 src/frontends/qt4/GuiBibtex.cpp:341
+#: src/frontends/qt4/ui/BibtexUi.ui:195 src/frontends/qt4/GuiBibtex.cpp:346
 #: src/insets/InsetBibtex.cpp:219 src/insets/InsetBibtex.cpp:239
 msgid "all references"
 msgstr "alle Literatureinträge"
@@ -639,7 +639,7 @@ msgstr "Dehnen"
 
 #: src/frontends/qt4/ui/BoxUi.ui:265 src/frontends/qt4/ui/ListingsUi.ui:103
 #: src/frontends/qt4/ui/TabularUi.ui:391 src/frontends/qt4/ui/TabularUi.ui:1549
-#: src/frontends/qt4/ui/WrapUi.ui:209 src/frontends/qt4/GuiDocument.cpp:1294
+#: src/frontends/qt4/ui/WrapUi.ui:209 src/frontends/qt4/GuiDocument.cpp:1296
 #: src/frontends/qt4/GuiParagraph.cpp:111 src/frontends/qt4/GuiTabular.cpp:845
 msgid "Left"
 msgstr "Links"
@@ -653,7 +653,7 @@ msgstr "Zentriert"
 
 #: src/frontends/qt4/ui/BoxUi.ui:275 src/frontends/qt4/ui/ListingsUi.ui:108
 #: src/frontends/qt4/ui/TabularUi.ui:401 src/frontends/qt4/ui/TabularUi.ui:1566
-#: src/frontends/qt4/ui/WrapUi.ui:214 src/frontends/qt4/GuiDocument.cpp:1296
+#: src/frontends/qt4/ui/WrapUi.ui:214 src/frontends/qt4/GuiDocument.cpp:1298
 #: src/frontends/qt4/GuiParagraph.cpp:112 src/frontends/qt4/GuiTabular.cpp:847
 msgid "Right"
 msgstr "Rechts"
@@ -808,7 +808,7 @@ msgstr "A hinzufügen"
 #: src/Buffer.cpp:4543 src/Buffer.cpp:4607 src/LyXVC.cpp:114 src/LyXVC.cpp:304
 #: src/buffer_funcs.cpp:78 src/frontends/qt4/GuiBranches.cpp:219
 #: src/frontends/qt4/GuiClipboard.cpp:247
-#: src/frontends/qt4/GuiDocument.cpp:2326 src/frontends/qt4/GuiParagraph.cpp:69
+#: src/frontends/qt4/GuiDocument.cpp:2328 src/frontends/qt4/GuiParagraph.cpp:69
 #: src/frontends/qt4/GuiParagraph.cpp:161 src/frontends/qt4/GuiPrefs.cpp:3328
 #: src/frontends/qt4/GuiView.cpp:2450 src/frontends/qt4/GuiView.cpp:2598
 #: src/frontends/qt4/GuiView.cpp:2622 src/frontends/qt4/GuiView.cpp:2636
@@ -846,19 +846,19 @@ msgstr "öße:"
 #: src/frontends/qt4/GuiDocument.cpp:742 src/frontends/qt4/GuiDocument.cpp:872
 #: src/frontends/qt4/GuiDocument.cpp:877 src/frontends/qt4/GuiDocument.cpp:918
 #: src/frontends/qt4/GuiDocument.cpp:929 src/frontends/qt4/GuiDocument.cpp:1088
-#: src/frontends/qt4/GuiDocument.cpp:1191
-#: src/frontends/qt4/GuiDocument.cpp:1288
-#: src/frontends/qt4/GuiDocument.cpp:1295
-#: src/frontends/qt4/GuiDocument.cpp:2082
-#: src/frontends/qt4/GuiDocument.cpp:2160
-#: src/frontends/qt4/GuiDocument.cpp:2161
+#: src/frontends/qt4/GuiDocument.cpp:1193
+#: src/frontends/qt4/GuiDocument.cpp:1290
+#: src/frontends/qt4/GuiDocument.cpp:1297
+#: src/frontends/qt4/GuiDocument.cpp:2084
 #: src/frontends/qt4/GuiDocument.cpp:2162
-#: src/frontends/qt4/GuiDocument.cpp:2182
-#: src/frontends/qt4/GuiDocument.cpp:2189
-#: src/frontends/qt4/GuiDocument.cpp:2196
-#: src/frontends/qt4/GuiDocument.cpp:2281
-#: src/frontends/qt4/GuiDocument.cpp:2810
-#: src/frontends/qt4/GuiDocument.cpp:4199 src/frontends/qt4/GuiExternal.cpp:77
+#: src/frontends/qt4/GuiDocument.cpp:2163
+#: src/frontends/qt4/GuiDocument.cpp:2164
+#: src/frontends/qt4/GuiDocument.cpp:2184
+#: src/frontends/qt4/GuiDocument.cpp:2191
+#: src/frontends/qt4/GuiDocument.cpp:2198
+#: src/frontends/qt4/GuiDocument.cpp:2283
+#: src/frontends/qt4/GuiDocument.cpp:2812
+#: src/frontends/qt4/GuiDocument.cpp:4201 src/frontends/qt4/GuiExternal.cpp:77
 #: src/frontends/qt4/GuiGraphics.cpp:71 src/frontends/qt4/GuiIndices.cpp:58
 #: 

[LyX/master] de.po

[Juergen Spitzmueller]

commit aea8130ef2b25245345e51655f1a4e465c86f241
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 11:03:46 2017 +0200

de.po
---
 po/de.gmo |  Bin 539513 -> 539581 bytes
 po/de.po  |  316 +++--
 2 files changed, 160 insertions(+), 156 deletions(-)

diff --git a/po/de.gmo b/po/de.gmo
index 3ba31e6..37eae5a 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 2b65e7d..e8143a7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -95,8 +95,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2017-09-09 09:14+0200\n"
-"PO-Revision-Date: 2017-09-09 09:16+0100\n"
+"POT-Creation-Date: 2017-09-10 11:01+0200\n"
+"PO-Revision-Date: 2017-09-10 11:02+0100\n"
 "Last-Translator: Juergen Spitzmueller \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -452,17 +452,17 @@ msgstr "Dieser Abschnitt des Literaturverzeichnisses 
enthält..."
 msgid ":"
 msgstr ":"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:185 src/frontends/qt4/GuiBibtex.cpp:334
+#: src/frontends/qt4/ui/BibtexUi.ui:185 src/frontends/qt4/GuiBibtex.cpp:339
 #: src/insets/InsetBibtex.cpp:223 src/insets/InsetBibtex.cpp:241
 msgid "all cited references"
 msgstr "alle zitierten Literatureinträge"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:190 src/frontends/qt4/GuiBibtex.cpp:336
+#: src/frontends/qt4/ui/BibtexUi.ui:190 src/frontends/qt4/GuiBibtex.cpp:341
 #: src/insets/InsetBibtex.cpp:221
 msgid "all uncited references"
 msgstr "alle nicht zitierten Literatureinträge"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:195 src/frontends/qt4/GuiBibtex.cpp:337
+#: src/frontends/qt4/ui/BibtexUi.ui:195 src/frontends/qt4/GuiBibtex.cpp:342
 #: src/insets/InsetBibtex.cpp:219 src/insets/InsetBibtex.cpp:239
 msgid "all references"
 msgstr "alle Literatureinträge"
@@ -639,7 +639,7 @@ msgstr "Dehnen"
 
 #: src/frontends/qt4/ui/BoxUi.ui:265 src/frontends/qt4/ui/ListingsUi.ui:103
 #: src/frontends/qt4/ui/TabularUi.ui:391 src/frontends/qt4/ui/TabularUi.ui:1549
-#: src/frontends/qt4/ui/WrapUi.ui:209 src/frontends/qt4/GuiDocument.cpp:1294
+#: src/frontends/qt4/ui/WrapUi.ui:209 src/frontends/qt4/GuiDocument.cpp:1296
 #: src/frontends/qt4/GuiParagraph.cpp:111 src/frontends/qt4/GuiTabular.cpp:845
 msgid "Left"
 msgstr "Links"
@@ -653,7 +653,7 @@ msgstr "Zentriert"
 
 #: src/frontends/qt4/ui/BoxUi.ui:275 src/frontends/qt4/ui/ListingsUi.ui:108
 #: src/frontends/qt4/ui/TabularUi.ui:401 src/frontends/qt4/ui/TabularUi.ui:1566
-#: src/frontends/qt4/ui/WrapUi.ui:214 src/frontends/qt4/GuiDocument.cpp:1296
+#: src/frontends/qt4/ui/WrapUi.ui:214 src/frontends/qt4/GuiDocument.cpp:1298
 #: src/frontends/qt4/GuiParagraph.cpp:112 src/frontends/qt4/GuiTabular.cpp:847
 msgid "Right"
 msgstr "Rechts"
@@ -808,7 +808,7 @@ msgstr "A hinzufügen"
 #: src/Buffer.cpp:4542 src/Buffer.cpp:4606 src/LyXVC.cpp:114 src/LyXVC.cpp:304
 #: src/buffer_funcs.cpp:78 src/frontends/qt4/GuiBranches.cpp:219
 #: src/frontends/qt4/GuiClipboard.cpp:247
-#: src/frontends/qt4/GuiDocument.cpp:2326 src/frontends/qt4/GuiParagraph.cpp:69
+#: src/frontends/qt4/GuiDocument.cpp:2328 src/frontends/qt4/GuiParagraph.cpp:69
 #: src/frontends/qt4/GuiParagraph.cpp:161 src/frontends/qt4/GuiPrefs.cpp:3328
 #: src/frontends/qt4/GuiView.cpp:2450 src/frontends/qt4/GuiView.cpp:2598
 #: src/frontends/qt4/GuiView.cpp:2622 src/frontends/qt4/GuiView.cpp:2636
@@ -846,19 +846,19 @@ msgstr "öße:"
 #: src/frontends/qt4/GuiDocument.cpp:742 src/frontends/qt4/GuiDocument.cpp:872
 #: src/frontends/qt4/GuiDocument.cpp:877 src/frontends/qt4/GuiDocument.cpp:918
 #: src/frontends/qt4/GuiDocument.cpp:929 src/frontends/qt4/GuiDocument.cpp:1088
-#: src/frontends/qt4/GuiDocument.cpp:1191
-#: src/frontends/qt4/GuiDocument.cpp:1288
-#: src/frontends/qt4/GuiDocument.cpp:1295
-#: src/frontends/qt4/GuiDocument.cpp:2082
-#: src/frontends/qt4/GuiDocument.cpp:2160
-#: src/frontends/qt4/GuiDocument.cpp:2161
+#: src/frontends/qt4/GuiDocument.cpp:1193
+#: src/frontends/qt4/GuiDocument.cpp:1290
+#: src/frontends/qt4/GuiDocument.cpp:1297
+#: src/frontends/qt4/GuiDocument.cpp:2084
 #: src/frontends/qt4/GuiDocument.cpp:2162
-#: src/frontends/qt4/GuiDocument.cpp:2182
-#: src/frontends/qt4/GuiDocument.cpp:2189
-#: src/frontends/qt4/GuiDocument.cpp:2196
-#: src/frontends/qt4/GuiDocument.cpp:2281
-#: src/frontends/qt4/GuiDocument.cpp:2810
-#: src/frontends/qt4/GuiDocument.cpp:4199 src/frontends/qt4/GuiExternal.cpp:77
+#: src/frontends/qt4/GuiDocument.cpp:2163
+#: src/frontends/qt4/GuiDocument.cpp:2164
+#: src/frontends/qt4/GuiDocument.cpp:2184
+#: src/frontends/qt4/GuiDocument.cpp:2191
+#: src/frontends/qt4/GuiDocument.cpp:2198
+#: src/frontends/qt4/GuiDocument.cpp:2283
+#: src/frontends/qt4/GuiDocument.cpp:2812
+#: src/frontends/qt4/GuiDocument.cpp:4201 src/frontends/qt4/GuiExternal.cpp:77
 #: src/frontends/qt4/GuiGraphics.cpp:71 src/frontends/qt4/GuiIndices.cpp:58
 #: 

[LyX/master] GuiBibtex: Use appropriate title when using Biblatex

[Juergen Spitzmueller]

commit 4ac94fecb668eb113cbef0e2f086814355ef4e1e
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 10:57:48 2017 +0200

GuiBibtex: Use appropriate title when using Biblatex
---
 src/frontends/qt4/GuiBibtex.cpp |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 45ad6ca..04f23d5 100644
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -304,6 +304,11 @@ void GuiBibtex::updateContents()
bool bibtopic = usingBibtopic();
bool biblatex = usingBiblatex();
 
+   if (biblatex)
+   setTitle(qt_("Biblatex Bibliography"));
+   else
+   setTitle(qt_("BibTeX Bibliography"));
+
databaseLW->clear();
 
docstring bibs = params_["bibfiles"];

[LyX/2.3.x] GuiBibtex: Use appropriate title when using Biblatex

[Juergen Spitzmueller]

commit e50a7d5b12389f8aea9cc228a0bb382292ee9440
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 10:57:48 2017 +0200

GuiBibtex: Use appropriate title when using Biblatex
---
 src/frontends/qt4/GuiBibtex.cpp |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 45ad6ca..04f23d5 100644
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -304,6 +304,11 @@ void GuiBibtex::updateContents()
bool bibtopic = usingBibtopic();
bool biblatex = usingBiblatex();
 
+   if (biblatex)
+   setTitle(qt_("Biblatex Bibliography"));
+   else
+   setTitle(qt_("BibTeX Bibliography"));
+
databaseLW->clear();
 
docstring bibs = params_["bibfiles"];

[LyX/master] Use default btprint value in the UI if none is given.

[Juergen Spitzmueller]

commit ed1b67b7ca69b1fd7d9214810d14b0525d44eb6a
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 10:51:42 2017 +0200

Use default btprint value in the UI if none is given.
---
 src/frontends/qt4/GuiBibtex.cpp |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 1f87b6a..45ad6ca 100644
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -338,7 +338,11 @@ void GuiBibtex::updateContents()
if (usingBiblatex() && !buffer().masterParams().multibib.empty())
btPrintCO->addItem(qt_("all reference units"), 
toqstr("bibbysection"));
 
-   
btPrintCO->setCurrentIndex(btPrintCO->findData(toqstr(params_["btprint"])));
+   docstring btprint = params_["btprint"];
+   if (btprint.empty())
+   // default
+   btprint = from_ascii("btPrintCited");
+   btPrintCO->setCurrentIndex(btPrintCO->findData(toqstr(btprint)));
 
// Only useful for biblatex
biblatexOptsLA->setVisible(biblatex);

[LyX/2.3.x] Use default btprint value in the UI if none is given.

[Juergen Spitzmueller]

commit abc145f250142e01016f486f2c585d84b343ed8c
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 10:51:42 2017 +0200

Use default btprint value in the UI if none is given.
---
 src/frontends/qt4/GuiBibtex.cpp |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 1f87b6a..45ad6ca 100644
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -338,7 +338,11 @@ void GuiBibtex::updateContents()
if (usingBiblatex() && !buffer().masterParams().multibib.empty())
btPrintCO->addItem(qt_("all reference units"), 
toqstr("bibbysection"));
 
-   
btPrintCO->setCurrentIndex(btPrintCO->findData(toqstr(params_["btprint"])));
+   docstring btprint = params_["btprint"];
+   if (btprint.empty())
+   // default
+   btprint = from_ascii("btPrintCited");
+   btPrintCO->setCurrentIndex(btPrintCO->findData(toqstr(btprint)));
 
// Only useful for biblatex
biblatexOptsLA->setVisible(biblatex);

[LyX/master] Disallow newlines in biblatex options

[Juergen Spitzmueller]

commit eff50597c09f804864fd9d10cbe547f5e49e28b9
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 10:05:10 2017 +0200

Disallow newlines in biblatex options

Fixes: #10757
---
 src/frontends/qt4/GuiDocument.cpp |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index e980921..d3232a2 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1185,6 +1185,8 @@ GuiDocument::GuiDocument(GuiView & lv)
biblioModule->bibtexOptionsLE));
biblioModule->defaultBiblioCO->lineEdit()->setValidator(new 
NoNewLineValidator(
biblioModule->defaultBiblioCO->lineEdit()));
+   biblioModule->citePackageOptionsLE->setValidator(new NoNewLineValidator(
+   biblioModule->citePackageOptionsLE));
 
// NOTE: we do not provide "custom" here for security reasons!
biblioModule->bibtexCO->clear();

[LyX/2.3.x] Disallow newlines in biblatex options

[Juergen Spitzmueller]

commit 1adfb8a6c715fcc0c9b38e3f453a9838bf2c2cf2
Author: Juergen Spitzmueller 
Date:   Sun Sep 10 10:05:10 2017 +0200

Disallow newlines in biblatex options

Fixes: #10757
---
 src/frontends/qt4/GuiDocument.cpp |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index e980921..d3232a2 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1185,6 +1185,8 @@ GuiDocument::GuiDocument(GuiView & lv)
biblioModule->bibtexOptionsLE));
biblioModule->defaultBiblioCO->lineEdit()->setValidator(new 
NoNewLineValidator(
biblioModule->defaultBiblioCO->lineEdit()));
+   biblioModule->citePackageOptionsLE->setValidator(new NoNewLineValidator(
+   biblioModule->citePackageOptionsLE));
 
// NOTE: we do not provide "custom" here for security reasons!
biblioModule->bibtexCO->clear();