[LyX/2.3.x] Fix crash when citeengine is unknown.

2018-02-12 Thread Richard Heck 
commit 0dfca93139d15e851725bd6d9d6098ef09c1ca8d
Author: Richard Heck 
Date:   Mon Feb 12 16:26:27 2018 -0500

Fix crash when citeengine is unknown.

(cherry picked from commit 5ee3396459602e0982234cab064c5c960af7e4fc)
---
 src/frontends/qt4/GuiDocument.cpp |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index 524ea39..0920378 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -4007,6 +4007,12 @@ bool GuiDocument::isBiblatex() const
biblioModule->citeEngineCO->itemData(

biblioModule->citeEngineCO->currentIndex()).toString();
 
+   // this can happen if the cite engine is unknown, which can happen
+   // if one is using a file that came from someone else, etc. in that
+   // case, we crash if we proceed.
+   if (engine.isEmpty())
+   return false;
+
return theCiteEnginesList[fromqstr(engine)]->getCiteFramework() == 
"biblatex";
 }

[LyX/2.3.x] Also fix chapter layout in tufte-book.

2018-02-12 Thread Richard Heck 
commit 50fc1bbc6d4bc49fcdf42ba3f972d4eb2056d05a
Author: Richard Heck 
Date:   Mon Feb 12 16:29:54 2018 -0500

Also fix chapter layout in tufte-book.

(cherry picked from commit 5f1b32f8c5770c316f3fcb107b0ad88f910e3617)
---
 lib/layouts/tufte-book.layout |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout
index d034386..94f3098 100644
--- a/lib/layouts/tufte-book.layout
+++ b/lib/layouts/tufte-book.layout
@@ -74,7 +74,7 @@ Style Chapter
NeedProtect 1
NextNoIndent1
ParSkip 0.4
-   TopSep  4
+   TopSep  2
BottomSep   0.8
ParSep  0.8
Align   Block

[LyX/2.3.x] Fixing painting regression - chapter top spacing.

2018-02-12 Thread Pavel Sanda 
commit ceee86a8245e7f8283fb45d4a596198329b452f5
Author: Pavel Sanda 
Date:   Mon Feb 12 21:14:56 2018 +0100

Fixing painting regression - chapter top spacing.

https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg203685.html
---
 lib/layouts/stdsections.inc |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc
index c8c2ece..fbd16fa 100644
--- a/lib/layouts/stdsections.inc
+++ b/lib/layouts/stdsections.inc
@@ -56,7 +56,7 @@ Style Chapter
NextNoIndent  1
ToggleIndent  Never
ParSkip   0.4
-   TopSep4
+   TopSep2
BottomSep 0.8
ParSep0.8
Align Block

[LyX/master] Also fix chapter layout in tufte-book.

2018-02-12 Thread Richard Heck 
commit 5f1b32f8c5770c316f3fcb107b0ad88f910e3617
Author: Richard Heck 
Date:   Mon Feb 12 16:29:54 2018 -0500

Also fix chapter layout in tufte-book.
---
 lib/layouts/tufte-book.layout |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout
index d034386..94f3098 100644
--- a/lib/layouts/tufte-book.layout
+++ b/lib/layouts/tufte-book.layout
@@ -74,7 +74,7 @@ Style Chapter
NeedProtect 1
NextNoIndent1
ParSkip 0.4
-   TopSep  4
+   TopSep  2
BottomSep   0.8
ParSep  0.8
Align   Block

[LyX/master] Fix crash when citeengine is unknown.

2018-02-12 Thread Richard Heck 
commit 5ee3396459602e0982234cab064c5c960af7e4fc
Author: Richard Heck 
Date:   Mon Feb 12 16:26:27 2018 -0500

Fix crash when citeengine is unknown.
---
 src/frontends/qt4/GuiDocument.cpp |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index 85318bc..8149b50 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -4007,6 +4007,12 @@ bool GuiDocument::isBiblatex() const
biblioModule->citeEngineCO->itemData(

biblioModule->citeEngineCO->currentIndex()).toString();
 
+   // this can happen if the cite engine is unknown, which can happen
+   // if one is using a file that came from someone else, etc. in that
+   // case, we crash if we proceed.
+   if (engine.isEmpty())
+   return false;
+
return theCiteEnginesList[fromqstr(engine)]->getCiteFramework() == 
"biblatex";
 }

[LyX/master] * lib/layouttranslations, sync with 2.3

2018-02-12 Thread Pavel Sanda 
commit 8160ed97bf69e262e38da44e056f67305469f9df
Author: Pavel Sanda 
Date:   Mon Feb 12 21:40:06 2018 +0100

* lib/layouttranslations, sync with 2.3
---
 lib/layouttranslations |   16 
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/layouttranslations b/lib/layouttranslations
index df68acb..f350f23 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -440,16 +440,16 @@ Translation eu
"List of Schemes" "Eskemen zerrenda"
"List of Tableaux" "Taulen zerrenda"
"Listing" "Zerrenda"
-   "Listings[[List of Listings]]" "Listings"
+   "Listings[[List of Listings]]" "Zerrendak"
"Nomenclature[[output]]" "Nomenklatura"
"Notation" "Notazioa"
-   "Note" "Ohar"
+   "Note" "Oharra"
"Problem" "Buruketa"
"Proof" "Frogapena"
-   "Property" "Jabegotza"
+   "Property" "Propietatea"
"Proposition" "Proposizioa"
"Question" "Galdera"
-   "Remark" "Oharra"
+   "Remark" "Oharpena"
"Scheme" "Eskema"
"Solution" "Emaitza"
"Summary" "Laburpena"
@@ -1236,7 +1236,7 @@ Translation ru
"Assumption" "Допущение"
"Axiom" "Аксиома"
"Case" "Вариант"
-   "Chart" "Чертёж"
+   "Chart" "Диаграмма"
"Claim" "Утверждение"
"Conclusion" "Заключение"
"Condition" "Условие"
@@ -1250,7 +1250,7 @@ Translation ru
"Graph[[mathematical]]" "График"
"Lemma" "Лемма"
"List of Algorithms" "Список алгоритмов"
-   "List of Charts" "Список чертежей"
+   "List of Charts" "Список диаграмм"
"List of Graphs[[mathematical]]" "Список графиков"
"List of Listings" "Список листингов"
"List of Schemes" "Список схем"
@@ -1451,8 +1451,8 @@ Translation sv
"Summary" "Sammanfattning"
"Tableau" "Tablå"
"Theorem" "Teorem"
-   "page[[nomencl]]" "page"
-   "see equation[[nomencl]]" "see equation"
+   "page[[nomencl]]" "sida"
+   "see equation[[nomencl]]" "se ekvation"
 End
 
 Translation tr

[LyX/2.3.x] * layouttranslations - eu & sv changes.

2018-02-12 Thread Pavel Sanda 
commit 2554a7dffb2890f4b851c60c41cfee116c56baf6
Author: Pavel Sanda 
Date:   Mon Feb 12 21:22:03 2018 +0100

* layouttranslations - eu & sv changes.
---
 lib/layouttranslations |   16 
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/layouttranslations b/lib/layouttranslations
index df68acb..f350f23 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -440,16 +440,16 @@ Translation eu
"List of Schemes" "Eskemen zerrenda"
"List of Tableaux" "Taulen zerrenda"
"Listing" "Zerrenda"
-   "Listings[[List of Listings]]" "Listings"
+   "Listings[[List of Listings]]" "Zerrendak"
"Nomenclature[[output]]" "Nomenklatura"
"Notation" "Notazioa"
-   "Note" "Ohar"
+   "Note" "Oharra"
"Problem" "Buruketa"
"Proof" "Frogapena"
-   "Property" "Jabegotza"
+   "Property" "Propietatea"
"Proposition" "Proposizioa"
"Question" "Galdera"
-   "Remark" "Oharra"
+   "Remark" "Oharpena"
"Scheme" "Eskema"
"Solution" "Emaitza"
"Summary" "Laburpena"
@@ -1236,7 +1236,7 @@ Translation ru
"Assumption" "Допущение"
"Axiom" "Аксиома"
"Case" "Вариант"
-   "Chart" "Чертёж"
+   "Chart" "Диаграмма"
"Claim" "Утверждение"
"Conclusion" "Заключение"
"Condition" "Условие"
@@ -1250,7 +1250,7 @@ Translation ru
"Graph[[mathematical]]" "График"
"Lemma" "Лемма"
"List of Algorithms" "Список алгоритмов"
-   "List of Charts" "Список чертежей"
+   "List of Charts" "Список диаграмм"
"List of Graphs[[mathematical]]" "Список графиков"
"List of Listings" "Список листингов"
"List of Schemes" "Список схем"
@@ -1451,8 +1451,8 @@ Translation sv
"Summary" "Sammanfattning"
"Tableau" "Tablå"
"Theorem" "Teorem"
-   "page[[nomencl]]" "page"
-   "see equation[[nomencl]]" "see equation"
+   "page[[nomencl]]" "sida"
+   "see equation[[nomencl]]" "se ekvation"
 End
 
 Translation tr

[LyX/2.3.x] ru.po: some corrections by Yuriy

2018-02-12 Thread Uwe Stöhr 
commit 90060459bed5808fd3cff69a59fbfe0060f7bbfe
Author: Uwe Stöhr 
Date:   Mon Feb 12 19:04:08 2018 +0100

ru.po: some corrections by Yuriy

 po/ru.po |  404 +++--
 1 files changed, 205 insertions(+), 199 deletions(-)

[LyX/master] ru.po: some corrections by Yuriy

2018-02-12 Thread Uwe Stöhr 
commit 4defe4c9c715e7839d386f7769551301b56ff296
Author: Uwe Stöhr 
Date:   Mon Feb 12 19:05:07 2018 +0100

ru.po: some corrections by Yuriy

 po/ru.po |  404 +++--
 1 files changed, 205 insertions(+), 199 deletions(-)

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

2018-02-12 Thread Uwe Stöhr 
commit d1ac023b505e4d0acfb92ba785f57d7ccd72f097
Merge: 9006045 db1c123
Author: Uwe Stöhr 
Date:   Mon Feb 12 19:04:25 2018 +0100

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

 lib/Makefile.am |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[LyX/2.3.x] Fix autotools build after AGUTeX.lyx reocation

2018-02-12 Thread Juergen Spitzmueller 
commit db1c123f45dfd79bf5aef5d36856df2e730f515c
Author: Juergen Spitzmueller 
Date:   Mon Feb 12 18:57:45 2018 +0100

Fix autotools build after AGUTeX.lyx reocation
---
 lib/Makefile.am |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 01c80b8..651b60f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2373,7 +2373,6 @@ dist_templates_DATA = \
templates/aastex6.lyx \
templates/acmart.lyx \
templates/AEA.lyx \
-   templates/AGUTeX.lyx \
templates/APA.lyx \
templates/APA6.lyx \
templates/beamer-conference-ornate-20min.lyx \
@@ -2420,6 +2419,7 @@ dist_obsoletetemplates_DATA = \
templates/obsolete/ACM-siggraph.lyx \
templates/obsolete/ACM-sigplan.lyx \
templates/obsolete/ACM-SIGS.lyx \
+   templates/obsolete/AGUTeX.lyx \
templates/obsolete/g-brief-de.lyx \
templates/obsolete/g-brief-en.lyx

[LyX/master] Customization.lyx: distribute all tracked changes

2018-02-12 Thread Uwe Stöhr 
commit 5c1a121d1d59f03e8756293ae77827218bdc9938
Author: Uwe Stöhr 
Date:   Mon Feb 12 18:53:12 2018 +0100

Customization.lyx: distribute all tracked changes
---
 lib/doc/Customization.lyx|   57 ++
 lib/doc/es/Customization.lyx |   52 ++---
 lib/doc/fr/Customization.lyx |   56 +++-
 lib/doc/ja/Customization.lyx |   44 ---
 4 files changed, 126 insertions(+), 83 deletions(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 0156672..40b32b4 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
@@ -22951,11 +22950,7 @@ The second sort of special definition might look like 
this:
 \end_layout
 
 \begin_layout LyX-Code
-
-\change_inserted -712698321 1517060160
-B
-\change_unchanged
-_pptext pp.
+B_pptext pp.
 \end_layout
 
 \begin_layout Standard
@@ -22966,29 +22961,19 @@ This defines a translatable piece of text, which 
allows relevant parts of
 status collapsed
 
 \begin_layout Plain Layout
-%
-\change_inserted -712698321 1517060167
-B
-\change_unchanged
-_pptext%
+%B_pptext%
 \end_layout
 
 \end_inset
 
 .
- 
-\change_inserted -712698321 1517060791
-Note that there are two different translation paths: All definitions starting
+ Note that there are two different translation paths: All definitions starting
  with 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1517060380
 B_
-\change_unchanged
-
 \end_layout
 
 \end_inset
@@ -23002,19 +22987,11 @@ B_
 \end_layout
 
 \begin_layout LyX-Code
-
-\change_inserted -712698321 1517060574
 _addtobib Add to bibliography only.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Standard
-Several of these 
-\change_inserted -712698321 1517060688
-translatable strings 
-\change_unchanged
-are predefined in 
+Several of these translatable strings are predefined in 
 \begin_inset Flex Code
 status collapsed
 
@@ -23040,17 +23017,7 @@ status collapsed
 \end_layout
 
 \begin_layout Standard
-So here then is an example that use
-\change_inserted -712698321 1517061156
-s
-\change_unchanged
- 
-\change_deleted -712698321 1517061147
-all
-\change_inserted -712698321 1517061148
-several of
-\change_unchanged
- these features:
+So here then is an example that uses several of these features:
 \begin_inset VSpace defskip
 \end_inset
 
@@ -23061,11 +23028,7 @@ several of
 \noindent
 
 \family sans
-!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %
-\change_inserted -712698321 1517060173
-B
-\change_unchanged
-_edtext%, ]]}]]}
+!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %B_edtext%, ]]}]]}
 \end_layout
 
 \begin_layout Standard
@@ -23089,11 +23052,7 @@ author
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1517060231
-B
-\change_unchanged
-_edtext
+B_edtext
 \end_layout
 
 \end_inset
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index de49e8a..4904591 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -23076,60 +23076,80 @@ El segundo tipo especial de definición sería como:
 \end_layout
 
 \begin_layout LyX-Code
-_pptext pp.
+B_pptext pp.
 \end_layout
 
 \begin_layout Standard
 Esto define un trozo de texto traducible, que permite traducir partes 
relevantes
- de la bibliografía
-\lang english
- or citation
-\lang spanish
-.
+ de la bibliografía o de la cita.
  Puede incluirse en una definición tratándolo como una clave: 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-%_pptext%
+%B_pptext%
 \end_layout
 
 \end_inset
 
 .
- Varios de estos están predefinidos en 
+ 
+\lang english
+Note that there are two different translation paths: All definitions starting
+ with 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-stdciteformats.inc
+
+\lang english
+B_
 \end_layout
 
 \end_inset
 
+, such as in the example above, will be translated to the currently active
+ buffer language (so the translation will match the generated document).
+ All definitions starting with underscore only will be translated to the
+ GUI language.
+ This is the proper translation for strings that only occur in the dialogs
+ or on buttons, such as this one:
+\end_layout
+
+\begin_layout LyX-Code
 
 \lang english
- and the diverse 
+_addtobib Add to bibliography only.
+\end_layout
+
+\begin_layout Standard
+Varios de estos cadenas de caracteres traducible están predefinidos en 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
+stdciteformats.inc
+\end_layout
 
-\lang english
+\end_inset
+
+ y

[LyX/2.3.x] Customization.lyx: distribute all tracked changes

2018-02-12 Thread Uwe Stöhr 
commit 08fd1a8131ce1541f31d34626de616f328a48e3f
Author: Uwe Stöhr 
Date:   Mon Feb 12 18:51:48 2018 +0100

Customization.lyx: distribute all tracked changes
---
 lib/doc/Customization.lyx|   57 ++
 lib/doc/es/Customization.lyx |   52 ++---
 lib/doc/fr/Customization.lyx |   56 +++-
 lib/doc/ja/Customization.lyx |   44 ---
 4 files changed, 126 insertions(+), 83 deletions(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 0156672..40b32b4 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
@@ -22951,11 +22950,7 @@ The second sort of special definition might look like 
this:
 \end_layout
 
 \begin_layout LyX-Code
-
-\change_inserted -712698321 1517060160
-B
-\change_unchanged
-_pptext pp.
+B_pptext pp.
 \end_layout
 
 \begin_layout Standard
@@ -22966,29 +22961,19 @@ This defines a translatable piece of text, which 
allows relevant parts of
 status collapsed
 
 \begin_layout Plain Layout
-%
-\change_inserted -712698321 1517060167
-B
-\change_unchanged
-_pptext%
+%B_pptext%
 \end_layout
 
 \end_inset
 
 .
- 
-\change_inserted -712698321 1517060791
-Note that there are two different translation paths: All definitions starting
+ Note that there are two different translation paths: All definitions starting
  with 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1517060380
 B_
-\change_unchanged
-
 \end_layout
 
 \end_inset
@@ -23002,19 +22987,11 @@ B_
 \end_layout
 
 \begin_layout LyX-Code
-
-\change_inserted -712698321 1517060574
 _addtobib Add to bibliography only.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Standard
-Several of these 
-\change_inserted -712698321 1517060688
-translatable strings 
-\change_unchanged
-are predefined in 
+Several of these translatable strings are predefined in 
 \begin_inset Flex Code
 status collapsed
 
@@ -23040,17 +23017,7 @@ status collapsed
 \end_layout
 
 \begin_layout Standard
-So here then is an example that use
-\change_inserted -712698321 1517061156
-s
-\change_unchanged
- 
-\change_deleted -712698321 1517061147
-all
-\change_inserted -712698321 1517061148
-several of
-\change_unchanged
- these features:
+So here then is an example that uses several of these features:
 \begin_inset VSpace defskip
 \end_inset
 
@@ -23061,11 +23028,7 @@ several of
 \noindent
 
 \family sans
-!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %
-\change_inserted -712698321 1517060173
-B
-\change_unchanged
-_edtext%, ]]}]]}
+!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %B_edtext%, ]]}]]}
 \end_layout
 
 \begin_layout Standard
@@ -23089,11 +23052,7 @@ author
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1517060231
-B
-\change_unchanged
-_edtext
+B_edtext
 \end_layout
 
 \end_inset
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index de49e8a..4904591 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -23076,60 +23076,80 @@ El segundo tipo especial de definición sería como:
 \end_layout
 
 \begin_layout LyX-Code
-_pptext pp.
+B_pptext pp.
 \end_layout
 
 \begin_layout Standard
 Esto define un trozo de texto traducible, que permite traducir partes 
relevantes
- de la bibliografía
-\lang english
- or citation
-\lang spanish
-.
+ de la bibliografía o de la cita.
  Puede incluirse en una definición tratándolo como una clave: 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-%_pptext%
+%B_pptext%
 \end_layout
 
 \end_inset
 
 .
- Varios de estos están predefinidos en 
+ 
+\lang english
+Note that there are two different translation paths: All definitions starting
+ with 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-stdciteformats.inc
+
+\lang english
+B_
 \end_layout
 
 \end_inset
 
+, such as in the example above, will be translated to the currently active
+ buffer language (so the translation will match the generated document).
+ All definitions starting with underscore only will be translated to the
+ GUI language.
+ This is the proper translation for strings that only occur in the dialogs
+ or on buttons, such as this one:
+\end_layout
+
+\begin_layout LyX-Code
 
 \lang english
- and the diverse 
+_addtobib Add to bibliography only.
+\end_layout
+
+\begin_layout Standard
+Varios de estos cadenas de caracteres traducible están predefinidos en 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
+stdciteformats.inc
+\end_layout
 
-\lang english
+\end_inset
+
+ y

[LyX/master] Updated Basque localization by Iñaki Larrañaga Murgoitio

2018-02-12 Thread Juergen Spitzmueller 
commit 8c150e4e834a3eb237ff8ac84e234624836f
Author: Juergen Spitzmueller 
Date:   Mon Feb 12 17:33:01 2018 +0100

Updated Basque localization by Iñaki Larrañaga Murgoitio

 po/eu.po | 8354 +++---
 1 files changed, 3690 insertions(+), 4664 deletions(-)

[LyX/2.3.x] Updated Basque localization by Iñaki Larrañaga Murgoitio

2018-02-12 Thread Juergen Spitzmueller 
commit ab2bd296296b780b29ea7755ef043b2f09ae
Author: Juergen Spitzmueller 
Date:   Mon Feb 12 16:41:21 2018 +0100

Updated Basque localization by Iñaki Larrañaga Murgoitio

 po/eu.gmo |  Bin 336571 -> 527569 bytes
 po/eu.po  | 7990 +++--
 2 files changed, 3494 insertions(+), 4496 deletions(-)

Re: [LyX/master] Remove template AGUTeX.lyx from Makefile

2018-02-12 Thread Jürgen Spitzmüller 
Am Montag, den 12.02.2018, 17:21 +0100 schrieb Jean-Marc Lasgouttes:
> Le 12/02/2018 à 17:06, Jean-Marc Lasgouttes a écrit :
> > commit 24fd7d2bac4db276992de1f736ad3a3ecc1647b8
> > Author: Jean-Marc Lasgouttes 
> > Date:   Mon Feb 12 17:06:19 2018 +0100
> > 
> >  Remove template AGUTeX.lyx from Makefile
> 
> Indeed. I though it was a non-distributed attic.

Should also be backported to 2.3.x BTW.

Jürgen

> 
> JMarc

signature.asc
Description: This is a digitally signed message part

Re: [LyX/master] Remove template AGUTeX.lyx from Makefile

2018-02-12 Thread Jean-Marc Lasgouttes 

Le 12/02/2018 à 17:06, Jean-Marc Lasgouttes a écrit :

commit 24fd7d2bac4db276992de1f736ad3a3ecc1647b8
Author: Jean-Marc Lasgouttes 
Date:   Mon Feb 12 17:06:19 2018 +0100

 Remove template AGUTeX.lyx from Makefile


Indeed. I though it was a non-distributed attic.

JMarc

[LyX/master] There is actually a home for obsolete templates in Makefile

2018-02-12 Thread Jean-Marc Lasgouttes 
commit 54e491c6fe921af3fb71e1d57902c4cd3a7e6fe1
Author: Jean-Marc Lasgouttes 
Date:   Mon Feb 12 17:19:10 2018 +0100

There is actually a home for obsolete templates in Makefile

Fixup to 24fd7d2b.
---
 lib/Makefile.am |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index de3b605..5f55f0b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2424,6 +2424,7 @@ dist_obsoletetemplates_DATA = \
templates/obsolete/ACM-siggraph.lyx \
templates/obsolete/ACM-sigplan.lyx \
templates/obsolete/ACM-SIGS.lyx \
+   templates/obsolete/AGUTeX.lyx \
templates/obsolete/g-brief-de.lyx \
templates/obsolete/g-brief-en.lyx

[LyX/master] Use parMetrics to access the par_metrics_ map

2018-02-12 Thread Jean-Marc Lasgouttes 
commit a25b48f86cdde98bbd5f8ece06c6bf2f12ee84db
Author: Jean-Marc Lasgouttes 
Date:   Mon Feb 12 17:11:09 2018 +0100

Use parMetrics to access the par_metrics_ map

In cursorY, it is dangerous to access par_petrics_[0], since one does
not know whether metrics have been computed for this paragraph (which
may be off-screen).

It is safer to use parMetrics(0), that will compute the paragraph
metrics as needed.

Fixes bug #8120.
---
 src/TextMetrics.cpp |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 5e0f3f8..c83709c 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -1502,14 +1502,14 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
 {
//lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl;
-   ParagraphMetrics const & pm = par_metrics_[sl.pit()];
+   ParagraphMetrics const & pm = parMetrics(sl.pit());
if (pm.rows().empty())
return 0;
 
int h = 0;
-   h -= par_metrics_[0].rows()[0].ascent();
+   h -= parMetrics(0).rows()[0].ascent();
for (pit_type pit = 0; pit < sl.pit(); ++pit) {
-   h += par_metrics_[pit].height();
+   h += parMetrics(pit).height();
}
int pos = sl.pos();
if (pos && boundary)

[LyX/master] Remove template AGUTeX.lyx from Makefile

2018-02-12 Thread Jean-Marc Lasgouttes 
commit 24fd7d2bac4db276992de1f736ad3a3ecc1647b8
Author: Jean-Marc Lasgouttes 
Date:   Mon Feb 12 17:06:19 2018 +0100

Remove template AGUTeX.lyx from Makefile
---
 lib/Makefile.am |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5286731..de3b605 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2378,7 +2378,6 @@ dist_templates_DATA = \
templates/aastex6.lyx \
templates/acmart.lyx \
templates/AEA.lyx \
-   templates/AGUTeX.lyx \
templates/APA.lyx \
templates/APA6.lyx \
templates/beamer-conference-ornate-20min.lyx \

[LyX/master] Implement buffer-anonymize more efficiently

2018-02-12 Thread Jean-Marc Lasgouttes 
commit 1dba36c7cec6aeec2576e7a99e2967e867076a01
Author: Jean-Marc Lasgouttes 
Date:   Wed Feb 7 15:35:46 2018 +0100

Implement buffer-anonymize more efficiently

The work is done now in Paragraph::anonymize().

Move the handling of the lfun to Buffer class.
---
 src/Buffer.cpp |   18 ++
 src/BufferView.cpp |   10 --
 src/Paragraph.cpp  |9 +
 src/Paragraph.h|4 
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index f42233f..7cabe6f 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2569,15 +2569,16 @@ bool Buffer::getStatus(FuncRequest const & cmd, 
FuncStatus & flag)
flag.setOnOff(params().output_changes);
break;
 
-   case LFUN_BUFFER_TOGGLE_COMPRESSION: {
+   case LFUN_BUFFER_TOGGLE_COMPRESSION:
flag.setOnOff(params().compressed);
break;
-   }
 
-   case LFUN_BUFFER_TOGGLE_OUTPUT_SYNC: {
+   case LFUN_BUFFER_TOGGLE_OUTPUT_SYNC:
flag.setOnOff(params().output_sync);
break;
-   }
+
+   case LFUN_BUFFER_ANONYMIZE:
+   break;
 
default:
return false;
@@ -2849,6 +2850,15 @@ void Buffer::dispatch(FuncRequest const & func, 
DispatchResult & dr)
params().output_sync = !params().output_sync;
break;
 
+   case LFUN_BUFFER_ANONYMIZE: {
+   undo().recordUndoFullBuffer(CursorData());
+   CursorData cur(doc_iterator_begin(this));
+   for ( ; cur ; cur.forwardPar())
+   cur.paragraph().anonymize();
+   dr.forceBufferUpdate();
+   break;
+   }
+
default:
dispatched = false;
break;
diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 0f4b634..7d7dc7f 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1134,7 +1134,6 @@ bool BufferView::getStatus(FuncRequest const & cmd, 
FuncStatus & flag)
case LFUN_WORD_FIND_FORWARD:
case LFUN_WORD_FIND_BACKWARD:
case LFUN_WORD_REPLACE:
-   case LFUN_BUFFER_ANONYMIZE:
case LFUN_MARK_OFF:
case LFUN_MARK_ON:
case LFUN_MARK_TOGGLE:
@@ -1622,15 +1621,6 @@ void BufferView::dispatch(FuncRequest const & cmd, 
DispatchResult & dr)
break;
}
 
-   case LFUN_BUFFER_ANONYMIZE: {
-   for (char c = '0'; c <= 'Z'; c++) {
-   odocstringstream ss;
-   ss << "a\n" << c << "\n0 0 1 1 0";
-   lyx::dispatch(FuncRequest(LFUN_WORD_REPLACE, ss.str()));
-   }
-   break;
-   }
-
case LFUN_WORD_FINDADV: {
FindAndReplaceOptions opt;
istringstream iss(to_utf8(cmd.argument()));
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 4ee612b..bc7bbee 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -4148,6 +4148,15 @@ SpellChecker::Result Paragraph::spellCheck(pos_type & 
from, pos_type & to,
 }
 
 
+void Paragraph::anonymize()
+{
+   // This is a very crude anonymization for now
+   for (char_type & c : d->text_)
+   if (isLetterChar(c) || isNumber(c))
+   c = 'a';
+}
+
+
 void Paragraph::Private::markMisspelledWords(
pos_type const & first, pos_type const & last,
SpellChecker::Result result,
diff --git a/src/Paragraph.h b/src/Paragraph.h
index 790c3f2..84fcf75 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -505,6 +505,10 @@ public:
/// presently used only in the XHTML output routines.
std::string magicLabel() const;
 
+   /// anonymizes the paragraph contents (but not the paragraphs
+   /// contained inside it. Does not handle undo.
+   void anonymize();
+
 private:
/// Expand the counters for the labelstring of \c layout
docstring expandParagraphLabel(Layout const &, BufferParams const &,

[LyX/master] Remove sections 6.7 and 6.4 from Additional manual (obsolete classes egs and aguplus) Edit LaTeXConfig.lyx accordingly Move teaplates/AGUTeX.lyx to teaplates/obsolete

2018-02-12 Thread jpc 
commit 86e42848fed1dbfea658255aef2c65b48b27fbbb
Author: jpc 
Date:   Mon Feb 12 11:30:18 2018 +0100

   Remove sections 6.7 and 6.4 from Additional manual (obsolete classes 
egs and aguplus)
   Edit LaTeXConfig.lyx accordingly
   Move teaplates/AGUTeX.lyx to teaplates/obsolete

 lib/doc/Additional.lyx|  280 -
 lib/doc/LaTeXConfig.lyx   |   47 ++-
 lib/doc/de/Additional.lyx |  355 -
 lib/doc/es/Additional.lyx |  282 -
 lib/doc/fr/Additional.lyx |  342 
 lib/doc/ja/Additional.lyx |  292 --
 lib/templates/AGUTeX.lyx  |  786 -
 lib/templates/obsolete/AGUTeX.lyx |  786 +
 8 files changed, 812 insertions(+), 2358 deletions(-)

[LyX/2.3.x] Remove sections 6.7 and 6.4 from Additional manual (obsolete classes egs and aguplus) Edit LaTeXConfig.lyx accordingly Move teaplates/AGUTeX.lyx to teaplates/obsolete

2018-02-12 Thread jpc 
commit 92adecb6e04024422930e7f7b60af1149d15c669
Author: jpc 
Date:   Mon Feb 12 11:30:18 2018 +0100

   Remove sections 6.7 and 6.4 from Additional manual (obsolete classes 
egs and aguplus)
   Edit LaTeXConfig.lyx accordingly
   Move teaplates/AGUTeX.lyx to teaplates/obsolete

 lib/doc/Additional.lyx|  280 -
 lib/doc/LaTeXConfig.lyx   |   47 ++-
 lib/doc/de/Additional.lyx |  355 -
 lib/doc/es/Additional.lyx |  282 -
 lib/doc/fr/Additional.lyx |  342 
 lib/doc/ja/Additional.lyx |  292 --
 lib/templates/AGUTeX.lyx  |  786 -
 lib/templates/obsolete/AGUTeX.lyx |  786 +
 8 files changed, 812 insertions(+), 2358 deletions(-)