[LyX/master] seminar.sty works also with non-TeX fonts but requires Babel.

2015-12-08 Thread Günter Milde 
commit dd5c3900ba53ff4bac11b6990e4b5ab7fbdbe700
Author: Günter Milde 
Date:   Tue Dec 8 17:40:15 2015 +0100

seminar.sty works also with non-TeX fonts but requires Babel.

Always-Babel now set in the example document.

Adapted the autotest categorization:
* fails for some developers (why?)
* wrong output with pdflatex/LuaTeX and DVI (missing landscape slides).

diff --git a/development/autotests/suspiciousTests 
b/development/autotests/suspiciousTests
index cf1851e..689858f 100644
--- a/development/autotests/suspiciousTests
+++ b/development/autotests/suspiciousTests
@@ -193,15 +193,6 @@ export/examples/aas_sample_(dvi3|pdf5)_(texF|systemF)
 export/examples/achemso_(dvi3|pdf5)_texF
 Sublabel: RESET
 #
-# GM: seminar.sty uses Postscript specials and does not work with
-# PDF (pdflatex). 
-# TODO: how to tag seminar_dvi? Landscape slides do not work with DVI.
-# Export to certain formats cannot be excluded from a module currently,
-# but even if they don't report an error, other formats result in corrupt
-# output documents (missing landscape slides).
-export/examples/(|fr/)seminar_pdf(2|[45]_systemF)
-#export/examples/(|fr/)seminar_dvi #not failing but wrong output
-#
 # GM: Korean? I don't expect this to work with Xe/Lua and TeXfonts.
 export/examples/ko/splash_(dvi3|pdf[45])_texF
 #
diff --git a/development/autotests/unreliableTests 
b/development/autotests/unreliableTests
index fb417af..162a376 100644
--- a/development/autotests/unreliableTests
+++ b/development/autotests/unreliableTests
@@ -16,8 +16,12 @@ 
export/examples/fa/splash_(dvi|pdf|pdf[23]|(dvi3|pdf4|pdf5)_(texF|systemF))
 # package versions, or the phase of the moon.
 Sublabel: erratic
 # for unknonwn reasons, seminar fails at some places:
-export/examples/(|fr/)seminar_(dvi|pdf|pdf[23]|pdf4_texF)
+export/examples/(|fr/)seminar_.*
 #
-Sublabel: 1wrong 2dvi 3output
-export/examples/(|fr/)seminar_dvi3.*F #not failing but wrong output
+Sublabel: 1wrong 2output
+#
+# seminar.sty uses Postscript specials 
+# -> wrong output with pdflatex/LuaTeX and DVI (missing landscape slides).
+export/examples/(|fr/)seminar_pdf[25].*)
+export/examples/(|fr/)seminar_dvi.*
 #
diff --git a/lib/examples/fr/seminar.lyx b/lib/examples/fr/seminar.lyx
index c9c83fc..43a8a15 100644
--- a/lib/examples/fr/seminar.lyx
+++ b/lib/examples/fr/seminar.lyx
@@ -12,7 +12,7 @@
 \use_default_options false
 \maintain_unincluded_children false
 \language french
-\language_package default
+\language_package babel
 \inputencoding auto
 \fontencoding global
 \font_roman "lmodern" "default"
@@ -88,15 +88,15 @@ Note:
 \family sans
 PDF (dvipdfm)
 \family default
- fonctionne correctement sur toutes les distributions \SpecialCharNoPassThru 
LaTeX
- pour visionner/expor
-ter en PDF.
+ fonctionne correctement sur toutes les distributions \SpecialChar LaTeX
+ pour visionner/exporter
+ en PDF.
  Visionner et exporter en DVI ou PS les documents 
 \family typewriter
 seminar
 \family default
  peut produire des résultats incorrects, en fonction de la distribution
- \SpecialCharNoPassThru LaTeX
+ \SpecialChar LaTeX
  et des visionneurs DVI ou PostScript
 \end_layout
 
@@ -128,10 +128,10 @@ beamer
 \end_layout
 
 \begin_layout LandscapeSlide
-
 \begin_inset Separator parbreak
 \end_inset
 
+
 \end_layout
 
 \begin_deeper
@@ -165,18 +165,17 @@ Harry Testman
 
 \end_deeper
 \begin_layout Standard
-
 \begin_inset Separator parbreak
 \end_inset
 
-\end_layout
 
+\end_layout
 
 \begin_layout LandscapeSlide
-
 \begin_inset Separator parbreak
 \end_inset
 
+
 \end_layout
 
 \begin_deeper
@@ -210,18 +209,17 @@ sem-user.dvi
 
 \end_deeper
 \begin_layout Standard
-
 \begin_inset Separator parbreak
 \end_inset
 
-\end_layout
 
+\end_layout
 
 \begin_layout PortraitSlide
-
 \begin_inset Separator parbreak
 \end_inset
 
+
 \end_layout
 
 \begin_deeper
@@ -261,18 +259,17 @@ Guide de l'utilisateur
 
 \end_deeper
 \begin_layout Standard
-
 \begin_inset Separator parbreak
 \end_inset
 
-\end_layout
 
+\end_layout
 
 \begin_layout LandscapeSlide
-
 \begin_inset Separator parbreak
 \end_inset
 
+
 \end_layout
 
 \begin_deeper
@@ -281,14 +278,13 @@ Que peut-on mettre dans un transparent?
 \end_layout
 
 \begin_layout Standard
-Pratiquement tout ce qui peut apparaître en \SpecialCharNoPassThru LaTeX
+Pratiquement tout ce qui peut apparaître en \SpecialChar LaTeX
  ordinaire peut aussi figurer
  dans un transparent.
 \end_layout
 
 \begin_layout Standard
-(Enfin, sauf les flottants \threehyphens
- qui en souhaiterait dans un transparent?)
+(Enfin, sauf les flottants — qui en souhaiterait dans un transparent?)
 \end_layout
 
 \begin_layout Standard
@@ -335,12 +331,11 @@ Ceux-ci figurent dans le menu déroulant des styles.
 
 \end_deeper
 \begin_layout Standard
-
 \begin_inset Separator parbreak
 \end_inset
 
-\end_layout
 
+\end_layout
 
 \begin_layout LandscapeSlide
 Le texte dans l'environnement 
@@ -349,10 +344,10 @@ DiapoPaysage
 \family default
  apparaîtra en haut du

[LyX/master] Fix typo.

2015-12-08 Thread Richard Heck 
commit 07992c9955afb490f2dc3e03a65c1aa0e59b06c6
Author: Richard Heck 
Date:   Tue Dec 8 10:41:22 2015 -0500

Fix typo.

diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx
index ce2d8c4..a4a7a6a 100644
--- a/lib/doc/Development.lyx
+++ b/lib/doc/Development.lyx
@@ -664,8 +664,18 @@ status collapsed
  For example, if a 2.2.0 user exported a template to 2.1.x format and tried
  to open the file in LyX 2.1.x, there would be an error because the file would
  contain a local layout whose format is too new.
- The root reason for this is that we do support converting layouts to older
- layout formats, as we do for the .lyx file format.
+ The root reason for this is that we do not support converting layouts to
+ older layout formats, as we do for the 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+.lyx
+\end_layout
+
+\end_inset
+
+ file format.
 \end_layout
 
 \begin_layout Subsection

[LyX/master] Wrong regex

2015-12-08 Thread Kornel Benko 
commit d4da5e939178a95662d6c41c4235a23be8f6e1b6
Author: Kornel Benko 
Date:   Tue Dec 8 18:29:12 2015 +0100

Wrong regex

diff --git a/development/autotests/unreliableTests 
b/development/autotests/unreliableTests
index 162a376..a2fef93 100644
--- a/development/autotests/unreliableTests
+++ b/development/autotests/unreliableTests
@@ -22,6 +22,6 @@ Sublabel: 1wrong 2output
 #
 # seminar.sty uses Postscript specials 
 # -> wrong output with pdflatex/LuaTeX and DVI (missing landscape slides).
-export/examples/(|fr/)seminar_pdf[25].*)
+export/examples/(|fr/)seminar_pdf[25].*
 export/examples/(|fr/)seminar_dvi.*
 #

[LyX/master] Set default output for "complex" manuals to PDF (pdflatex).

2015-12-08 Thread Günter Milde 
commit 4d0356aea128542205b1d31bc5df799f710d9544
Author: Günter Milde 
Date:   Wed Dec 9 08:54:38 2015 +0100

Set default output for "complex" manuals to PDF (pdflatex).

This is the "design format" for the manuals. Some features do not
work in other formats.
See http://permalink.gmane.org/gmane.editors.lyx.devel/158616

diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index 69ec138..0ff13d7 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -52,7 +52,7 @@ shapepar
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 4c8c6c1..e07658b 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -171,7 +171,7 @@ graphicboxes
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/de/Additional.lyx b/lib/doc/de/Additional.lyx
index 271b7a1..fe732f2 100644
--- a/lib/doc/de/Additional.lyx
+++ b/lib/doc/de/Additional.lyx
@@ -51,7 +51,7 @@ shapepar
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 51036c7..6f82296 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -174,7 +174,7 @@ graphicboxes
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/es/Additional.lyx b/lib/doc/es/Additional.lyx
index cea9512..cb431ae 100644
--- a/lib/doc/es/Additional.lyx
+++ b/lib/doc/es/Additional.lyx
@@ -52,7 +52,7 @@ shapepar
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 109fff0..815fe13 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -175,7 +175,7 @@ graphicboxes
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx
index 1dfa3e2..2a5bc62 100644
--- a/lib/doc/fr/Additional.lyx
+++ b/lib/doc/fr/Additional.lyx
@@ -52,7 +52,7 @@ shapepar
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index 544e963..c0078d2 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -177,7 +177,7 @@ graphicboxes
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/he/Intro.lyx b/lib/doc/he/Intro.lyx
index a44bab6..0475e43 100644
--- a/lib/doc/he/Intro.lyx
+++ b/lib/doc/he/Intro.lyx
@@ -54,7 +54,7 @@
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/he/Tutorial.lyx b/lib/doc/he/Tutorial.lyx
index cc23373..031ee62 100644
--- a/lib/doc/he/Tutorial.lyx
+++ b/lib/doc/he/Tutorial.lyx
@@ -64,7 +64,7 @@ logicalmkup
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index aef8242..207fa08 100644
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -97,7 +97,7 @@ End
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index b67a293..abe6000 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -212,7 +212,7 @@ End
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default

[LyX/master] French UserGuide.lyx: make document compilable without PNGs

2015-12-08 Thread Uwe Stöhr 
commit e2bc9f4a56d47fe624eb5a8b8ad101db0bfee226
Author: Uwe Stöhr 
Date:   Wed Dec 9 02:11:40 2015 +0100

French UserGuide.lyx: make document compilable without PNGs

also store default output format and other small corrections and adjustments

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 73fb95a..2e83fbe 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -74,7 +74,7 @@ logicalmkup
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command bibtex
 \index_command default
@@ -2178,50 +2178,24 @@ profondeur
 
 \begin_layout Standard
 Le bouton 
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Graphics
-   filename ../../images/reload.png
-
-\end_inset
-
-
-\begin_inset space \space{}
+\begin_inset Info
+type  "icon"
+arg   "reload"
 \end_inset
 
  remet le plan à jour (bien que ce ne soit pas normalement nécessaire).
  À côté se trouvent les boutons qui permettent de modifier la position des
  sections dans le document.
  Avec les boutons 
-\begin_inset space \space{}
-\end_inset
-
-
-\begin_inset Graphics
-   filename ../../images/down.png
-   scale 85
-
-\end_inset
-
-
-\begin_inset space \space{}
+\begin_inset Info
+type  "icon"
+arg   "outline-down"
 \end_inset
 
  et 
-\begin_inset space \space{}
-\end_inset
-
-
-\begin_inset Graphics
-   filename ../../images/up.png
-   scale 85
-
-\end_inset
-
-
-\begin_inset space \space{}
+\begin_inset Info
+type  "icon"
+arg   "outline-up"
 \end_inset
 
  situés en bas de la fenêtre de plan, vous pouvez déplacer des sections
@@ -2239,17 +2213,15 @@ Le bouton
  va alors renuméroter automatiquement les sections pour refléter le nouvel
  ordre.
  Avec les boutons 
-\begin_inset Graphics
-   filename ../../images/outline-out.png
-   scale 85
-
+\begin_inset Info
+type  "icon"
+arg   "outline-out"
 \end_inset
 
  et 
-\begin_inset Graphics
-   filename ../../images/outline-in.png
-   scale 85
-
+\begin_inset Info
+type  "icon"
+arg   "outline-in"
 \end_inset
 
  (ou les raccourcis clavier correspondants 
@@ -3254,18 +3226,7 @@ Powerdot sert à faire des transparents pour des 
présentations;
 \end_layout
 
 \begin_layout Description
-REVTe
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X pour écrire des articles pour les publications de l'
+REVTeX pour écrire des articles pour les publications de l'
 \lang english
 American Physical Society
 \lang french
@@ -8708,12 +8669,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
 
@@ -8726,6 +8689,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8751,6 +8715,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -8896,15 +8861,15 @@ liste
  d'état vous dira à quel niveau d'emboîtement vous vous situez).
  A la place du menu, vous pouvez utiliser les boutons de la barre d'outils
  
-\begin_inset Graphics
-   filename ../../images/depth-increment.png
-
+\begin_inset Info
+type  "icon"
+arg   "depth-increment"
 \end_inset
 
  et 
-\begin_inset Graphics
-   filename ../../images/depth-decrement.png
-
+\begin_inset Info
+type  "icon"
+arg   "depth-decrement"
 \end_inset
 
  ou les raccourcis clavier bien pratiques 
@@ -17356,8 +17321,9 @@ Visionner (autres formats)
 \family default
  ou le bouton de la barre d'outils 
 \begin_inset Graphics
-   filename ../../images/view-others.png
-   scale 85
+   filename ../../images/view-others.svgz
+   lyxscale 15
+   height 12pt
groupId toolbarbuttons
 
 \end_inset
@@ -32388,18 +32354,7 @@ Code
 \begin_inset space ~
 \end_inset
 
-Te
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X
+TeX
 \family default
  soit en cliquant sur le bouton 
 \begin_inset Info
@@ -32621,18 +32576,7 @@ Paramètres
 \SpecialChar menuseparator
 
 \family sans
-Préambule LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX
+Préambule LaTeX
 \family default
 ) avec la commande
 \end_layout
@@ -33351,18 +33295,7 @@ Code
 \begin_inset space ~
 \end_inset
 
-Te
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X
+TeX
 \family default
 ):
 \end_layout
@@ -33577,19 +33510,7 @@ hauteur
  via 
 \family sans
 Document\SpecialChar menuseparator
-Fichier journal La
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-\SpecialChar TeX
-
+Fichier journal LaTeX
 \family default
  et vérifiez en appuyant sur le bouton 
 \family sans
@@ -36185,18

[LyX/master] UserGuide.lyx: remove some unnecessary TeX code

2015-12-08 Thread Uwe Stöhr 
commit bcef5b3a2ec1a4cf1562aac68a5b66b6ad545a19
Author: Uwe Stöhr 
Date:   Wed Dec 9 02:13:04 2015 +0100

UserGuide.lyx: remove some unnecessary TeX code

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index b3e51e6..a9accd5 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -31393,18 +31393,7 @@ footheight
 \family sans
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
-Lat
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX
+LaTeX
 \begin_inset space ~
 \end_inset
 
@@ -38082,8 +38071,7 @@ This menu lists the documentation files of \SpecialChar 
LyX
 \begin_layout Standard
 The menu 
 \family sans
-\SpecialChar LaTeX
-
+LaTeX
 \begin_inset space ~
 \end_inset
 
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index f5654da..c9a91fe 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -8474,12 +8474,10 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim
-
 Dies ist Unformatiert.
 \end_layout
 
 \begin_layout Verbatim
-
 Die folgenden 2 Zeilen sind leer:
 \end_layout
 
@@ -8492,7 +8490,6 @@ Die folgenden 2 Zeilen sind leer:
 \end_layout
 
 \begin_layout Verbatim
-
 Fast alles ist in Unformatiert erlaubt:"%&$§#~'`
 \backslash
 }][{|
@@ -8516,7 +8513,6 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim*
-
 Dies ist Unformatiert*.
 \end_layout
 
@@ -38087,8 +38083,7 @@ Dieses Menü listet die Dokumentationsdateien von 
\SpecialChar LyX
 \begin_layout Standard
 Das Menü 
 \family sans
-\SpecialChar LaTeX
-
+LaTeX
 \begin_inset space ~
 \end_inset
 
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 19bc188..295a0da 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -2720,18 +2720,7 @@ Powerdot Formato para presentaciones
 \end_layout
 
 \begin_layout Description
-REVTe
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X Para escribir artículos publicados por: 
+REVTeX Para escribir artículos publicados por: 
 \emph on
 American Physical Society
 \emph default
@@ -31429,18 +31418,7 @@ Código
 \begin_inset space ~
 \end_inset
 
-Te
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X
+TeX
 \family default
  o con el botón 
 \begin_inset Info
@@ -31661,18 +31639,7 @@ Preámbulo
 \begin_inset space ~
 \end_inset
 
-LaT
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX
+LaTeX
 \family default
 ) con el comando
 \end_layout
@@ -32413,18 +32380,7 @@ Para la definición hacen falta algunos comandos 
\SpecialChar LaTeX
  (menú 
 \family sans
 Insertar\SpecialChar menuseparator
-Código Te
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X
+Código TeX
 \family default
 ):
 \end_layout
@@ -32617,19 +32573,7 @@ Altura es una longitud en unidades estándar.
  pie y haz una vista previa PDF del documento.
  Luego abres el 
 \family sans
-Registro de La
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-\SpecialChar TeX
-
+Registro de LaTeX
 \family default
  en el menú 
 \family sans
@@ -34048,10 +33992,10 @@ Enchant es una biblioteca envoltorio de diferentes 
entornos configurables.
 hunspell
 \family default
 .
+ \SpecialChar LyX
  
 \lang english
-\SpecialChar LyX
- on Mac
+on Mac
 \begin_inset space ~
 \end_inset
 
@@ -34922,18 +34866,7 @@ Nota
 \begin_inset space ~
 \end_inset
 
-Ly
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X
+LyX
 \end_layout
 
 \end_inset
@@ -38917,8 +38850,7 @@ de
 \begin_inset space ~
 \end_inset
 
-\SpecialChar LaTeX
-
+LaTeX
 \family default
  genera un archivo \SpecialChar LyX
  con información sobre los paquetes \SpecialChar LaTeX
@@ -43148,8 +43080,7 @@ Preámbulo
 \begin_inset space ~
 \end_inset
 
-\SpecialChar LaTeX
-
+LaTeX
 \family default
 ).
  Por ejemplo, para el € hay que añadir la línea

[LyX/master] Math.lyx: image adjustments

2015-12-08 Thread Uwe Stöhr 
commit 95894a9bd9c55594cf354ce7a0a4783360566658
Author: Uwe Stöhr 
Date:   Wed Dec 9 02:30:38 2015 +0100

Math.lyx: image adjustments

the font size is 12 pt so the icons can have this size too; besides this 
readability is ore important than to fit in a text line

diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index dabb435..2098c80 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -2,7 +2,7 @@
 \lyxformat 503
 \begin_document
 \begin_header
-\origin /systemlyxdir/doc/
+\origin unavailable
 \textclass scrartcl
 \begin_preamble
 % DO NOT ALTER THIS PREAMBLE!!!
@@ -3401,7 +3401,7 @@ arg   "math-insert \\space"
 \begin_inset Graphics
filename ../images/math/phantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
@@ -3601,14 +3601,10 @@ vphantom
 \end_inset
 
  (toolbar button 
-\begin_inset space ~
-\end_inset
-
-
 \begin_inset Graphics
filename ../images/math/vphantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
@@ -3631,14 +3627,10 @@ hphantom
 \end_inset
 
  (toolbar button 
-\begin_inset space ~
-\end_inset
-
-
 \begin_inset Graphics
filename ../images/math/hphantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index 4a552dd..c7ac0b5 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -3410,7 +3410,7 @@ arg   "math-insert \\space"
 \begin_inset Graphics
filename ../../images/math/phantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
@@ -3612,14 +3612,10 @@ vphantom
 \end_inset
 
  (Werkzeugleistenknopf 
-\begin_inset space ~
-\end_inset
-
-
 \begin_inset Graphics
filename ../../images/math/vphantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
@@ -3642,14 +3638,10 @@ hphantom
 \end_inset
 
  (Werkzeugleistenknopf 
-\begin_inset space ~
-\end_inset
-
-
 \begin_inset Graphics
filename ../../images/math/hphantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index 962..4c67dc0 100644
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -3382,14 +3382,10 @@ phantom
 \end_inset
 
  o el botón 
-\begin_inset space ~
-\end_inset
-
-
 \begin_inset Graphics
filename ../../images/math/phantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
@@ -3610,14 +3606,10 @@ vphantom
 \end_inset
 
  (botón 
-\begin_inset space ~
-\end_inset
-
-
 \begin_inset Graphics
filename ../../images/math/vphantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
@@ -3640,14 +3632,10 @@ hphantom
 \end_inset
 
  (botón 
-\begin_inset space ~
-\end_inset
-
-
 \begin_inset Graphics
filename ../../images/math/hphantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index 694bbbc..c6c882f 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -3450,7 +3450,7 @@ arg   "math-insert \\space"
 \begin_inset Graphics
filename ../../images/math/phantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
@@ -3659,15 +3659,11 @@ vphantom
 
 \end_inset
 
- (bouton
-\begin_inset space ~
-\end_inset
-
-
+ (bouton 
 \begin_inset Graphics
filename ../../images/math/vphantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
@@ -3689,15 +3685,11 @@ hphantom
 
 \end_inset
 
- (bouton
-\begin_inset space ~
-\end_inset
-
-
+ (bouton 
 \begin_inset Graphics
filename ../../images/math/hphantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index b05453a..1b72d7e 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -3436,7 +3436,7 @@ arg   "math-insert \\space"
 \begin_inset Graphics
filename ../../images/math/phantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
@@ -3639,14 +3639,10 @@ vphantom
 \end_inset
 
 (ツールバーボタン
-\begin_inset space ~
-\end_inset
-
-
 \begin_inset Graphics
filename ../../images/math/vphantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset
 
@@ -3669,14 +3665,10 @@ hphantom
 \end_inset
 
 (ツールバーボタン
-\begin_inset space ~
-\end_inset
-
-
 \begin_inset Graphics
filename ../../images/math/hphantom.svgz
lyxscale 14
-   scale 9
+   height 12pt
 
 \end_inset

[LyX/master] German UserGuide.lyx: make document compilable without PNGs

2015-12-08 Thread Uwe Stöhr 
commit 844b23614401bb20ff0811bec44482e25170b95f
Author: Uwe Stöhr 
Date:   Wed Dec 9 01:56:10 2015 +0100

German UserGuide.lyx: make document compilable without PNGs

also store default output format and many other small corrections and 
adjustments

diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 1936147..f5654da 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -77,7 +77,7 @@ enumitem
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command bibtex
 \index_command default
@@ -376,18 +376,7 @@ HILFE
 
 \begin_layout Standard
 Das Hilfesystem besteht aus den \SpecialChar LyX
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-"=
-\end_layout
-
-\end_inset
-
-Handbüchern,
+-Handbüchern,
 \begin_inset Note Note
 status collapsed
 
@@ -1518,11 +1507,9 @@ Rückgängig
 Strg+Z
 \family default
  oder 
-\begin_inset Graphics
-   filename ../../images/undo.png
-   scale 85
-   groupId Icon
-
+\begin_inset Info
+type  "icon"
+arg   "undo"
 \end_inset
 
 ), um einen falschen Arbeitsschritt zurückzunehmen.
@@ -1540,11 +1527,9 @@ len
 Strg+Y
 \family default
  oder 
-\begin_inset Graphics
-   filename ../../images/redo.png
-   scale 85
-   groupId Icon
-
+\begin_inset Info
+type  "icon"
+arg   "redo"
 \end_inset
 
 ) das Rückgängigmachen schrittweise wieder zurücknehmen.
@@ -1682,16 +1667,8 @@ linke
  Mit 
 \family sans
 Bearbeiten\SpecialChar menuseparator
-Kopieren, Strg+C
+Kopieren
 \family default
- oder 
-\begin_inset Graphics
-   filename ../../images/copy.png
-   scale 85
-   groupId Icon
-
-\end_inset
-
  übernehmen Sie den markierten Text in den internen Kopierspeicher von 
\SpecialChar LyX
 .
 \end_layout
@@ -1700,16 +1677,8 @@ Kopieren, Strg+C
 Positionieren Sie den Textcursor neu und fügen Sie die Auswahl mit 
 \family sans
 Bearbeiten\SpecialChar menuseparator
-Einfügen, Strg+V
+Einfügen
 \family default
- oder 
-\begin_inset Graphics
-   filename ../../images/paste.png
-   scale 85
-   groupId Icon
-
-\end_inset
-
  in den Text ein.
 \end_layout
 
@@ -1950,22 +1919,18 @@ Behalten
 \end_layout
 
 \begin_layout Standard
-\begin_inset Graphics
-   filename ../../images/reload.png
-   scale 85
-   groupId Icon
-
+\begin_inset Info
+type  "icon"
+arg   "reload"
 \end_inset
 
  : aktualisiert das Verzeichnis
 \end_layout
 
 \begin_layout Standard
-\begin_inset Graphics
-   filename ../../images/outline-out.png
-   scale 85
-   groupId Icon
-
+\begin_inset Info
+type  "icon"
+arg   "outline-out"
 \end_inset
 
  : schiebt das ausgewählte Gliederungs-Element um eine Stufe nach oben (zum
@@ -1974,11 +1939,9 @@ Behalten
 \end_layout
 
 \begin_layout Standard
-\begin_inset Graphics
-   filename ../../images/outline-in.png
-   scale 85
-   groupId Icon
-
+\begin_inset Info
+type  "icon"
+arg   "outline-in"
 \end_inset
 
  : schiebt das ausgewählte Gliederungs-Element um eine Stufe nach unten
@@ -1987,10 +1950,9 @@ Behalten
 \end_layout
 
 \begin_layout Standard
-\begin_inset Graphics
-   filename ../../images/down.png
-   scale 70
-
+\begin_inset Info
+type  "icon"
+arg   "outline-down"
 \end_inset
 
  : schiebt das ausgewählte Gliederungs-Element nach unten.
@@ -1998,10 +1960,9 @@ Behalten
 \end_layout
 
 \begin_layout Standard
-\begin_inset Graphics
-   filename ../../images/up.png
-   scale 70
-
+\begin_inset Info
+type  "icon"
+arg   "outline-up"
 \end_inset
 
  : schiebt das ausgewählte Gliederungs-Element nach oben.
@@ -4223,15 +4184,7 @@ Absatz
 \family sans
 Einstellungen
 \family default
- oder klicken Sie auf 
-\begin_inset Graphics
-   filename ../../images/layout-paragraph.png
-   scale 85
-   groupId Icon
-
-\end_inset
-
-, um das Menü 
+ um das Menü 
 \family sans
 Absatz-Einstellun\SpecialChar softhyphen
 gen
@@ -4344,83 +4297,25 @@ name "sec:Absatzumgebungen"
 
 \begin_layout Standard
 Die Absatzumgebungen entsprechen in einer normalen \SpecialChar LaTeX
--Datei 
-\family typewriter
-
-\backslash
-begin{
-\emph on
-Umgebung
-\emph default
-} 
-\family default
-\SpecialChar ldots
- 
-\family typewriter
-
-\backslash
-end{
-\emph on
-Umgebung
-\emph default
-}
-\family default
-.
- Alles zwischen den beiden Befehlen ist ein Absatz.
+-Datei
 \end_layout
 
 \begin_layout Standard
 
 \series bold
-\begin_inset Note Greyedout
-status open
-
-\begin_layout Plain Layout
-
-\series bold
-Anmerkung
-\series default
-: Wie Sie in der Vorschau sehen können, wird die obige Zeile nicht richtig
- umgebrochen.
- \SpecialChar LaTeX
- hat Probleme, Zeichenketten, die aus Worten und Sonderzeichen bestehen,
- richtig umzubrechen, siehe auch 
-\begin_inset CommandInset citation
-LatexCommand cite
-key "latex-einführung"
-
-\end_inset
-
-, S.
-\begin_inset space \space{}
-\end_inset
-
-21 und S.
-\begin_inset space

[LyX/master] Spanish UserGuide.lyx: make document compilable without PNGs

2015-12-08 Thread Uwe Stöhr 
commit 3a7ec39a7905f1fc8c6851e9309e9d630cc1a012
Author: Uwe Stöhr 
Date:   Wed Dec 9 01:25:57 2015 +0100

Spanish UserGuide.lyx: make document compilable without PNGs

diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 7ea167e..ff9f6d6 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -1799,53 +1799,24 @@ Mantener
 
 \begin_layout Standard
 El botón 
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Graphics
-   filename ../../images/reload.png
-   scale 85
-
-\end_inset
-
-
-\begin_inset space ~
+\begin_inset Info
+type  "icon"
+arg   "reload"
 \end_inset
 
-refresca el IG (aunque esto no será necesario, normalmente).
+ refresca el IG (aunque esto no será necesario, normalmente).
  Cerca de este hay botones que permiten cambiar la posición de las secciones
  en el documento.
  Los botones 
-\begin_inset space \space{}
-\end_inset
-
-
-\begin_inset Graphics
-   filename ../../images/down.png
-   scale 85
-   groupId toolbarbuttons
-
-\end_inset
-
-
-\begin_inset space ~
+\begin_inset Info
+type  "icon"
+arg   "outline-down"
 \end_inset
 
  y 
-\begin_inset space \space{}
-\end_inset
-
-
-\begin_inset Graphics
-   filename ../../images/up.png
-   scale 85
-   groupId toolbarbuttons
-
-\end_inset
-
-
-\begin_inset space ~
+\begin_inset Info
+type  "icon"
+arg   "outline-up"
 \end_inset
 
  mueven las secciones hacia arriba y hacia abajo.
@@ -1865,35 +1836,15 @@ refresca el IG (aunque esto no será necesario, 
normalmente).
  \SpecialChar LyX
  reordenará automáticamente la numeración.
  Con los botones 
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Graphics
-   filename ../../images/outline-out.png
-   scale 85
-   groupId toolbarbuttons
-
-\end_inset
-
-
-\begin_inset space ~
+\begin_inset Info
+type  "icon"
+arg   "outline-out"
 \end_inset
 
  y 
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Graphics
-   filename ../../images/outline-in.png
-   scale 85
-   groupId toolbarbuttons
-
-\end_inset
-
-
-\begin_inset space ~
+\begin_inset Info
+type  "icon"
+arg   "outline-in"
 \end_inset
 
  (o los correspondientes atajos de teclado 
@@ -8547,12 +8498,14 @@ Literal
 \end_layout
 
 \begin_layout Verbatim
+
 Esto es entorno Literal.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 Las dos  líneas siguientes están vacías:
 \end_layout
 
@@ -8565,6 +8518,7 @@ Las dos  líneas siguientes están vacías:
 \end_layout
 
 \begin_layout Verbatim
+
 Casi todo está permitido en entorno Literal:"%&$§#~'`
 \backslash
 }][{|
@@ -8594,6 +8548,7 @@ with the difference that spaces appear in the output as 
the character '
 \end_layout
 
 \begin_layout Verbatim
+
 Esto es entorno Literal*.
 \end_layout
 
@@ -16767,8 +16722,9 @@ Ver (Otros formatos)
 \family default
  o con el botón 
 \begin_inset Graphics
-   filename ../../images/view-others.png
-   scale 85
+   filename ../../images/view-others.svgz
+   lyxscale 15
+   height 12pt
groupId toolbarbuttons
 
 \end_inset
@@ -35587,18 +35543,7 @@ CJK
 \begin_inset space ~
 \end_inset
 
-L
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-yX 
+LyX 
 \family default
 formato especial de las versiones 1.4.x de \SpecialChar LyX
  para chino, japonés y coreano
@@ -35647,18 +35592,7 @@ DVI
 \begin_inset space ~
 \end_inset
 
-(LuaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX) formato DVI que usa el programa 
+(LuaTeX) formato DVI que usa el programa 
 \family typewriter
 Lua\SpecialChar TeX
 
@@ -35754,33 +35688,11 @@ MathML
 \end_layout
 
 \begin_layout Description
-LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX
+LaTeX
 \begin_inset space ~
 \end_inset
 
-(LuaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX) archivo de texto con el código \SpecialChar LaTeX
+(LuaTeX) archivo de texto con el código \SpecialChar LaTeX
  compilable con el programa 
 \family typewriter
 Lua\SpecialChar TeX
@@ -35790,18 +35702,7 @@ Lua\SpecialChar TeX
 \begin_layout Description
 
 \family sans
-LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX
+LaTeX
 \begin_inset space ~
 \end_inset
 
@@ -35819,18 +35720,7 @@ pdflatex
 \begin_layout Description
 
 \family sans
-LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX
+LaTeX
 \begin_inset space ~
 \end_inset
 
@@ -35844,33 +35734,11 @@ latex.
 \end_layout
 
 \begin_layout Description
-LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX
+LaTeX
 \begin_inset space ~
 \end_inset
 
-(XeT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX)

[LyX/master] English UserGuide.lyx: make document compilable without PNGs

2015-12-08 Thread Uwe Stöhr 
commit 9d66dc285964152d0069e6045f18f976ec2cd9f2
Author: Uwe Stöhr 
Date:   Wed Dec 9 01:31:53 2015 +0100

English UserGuide.lyx: make document compilable without PNGs

also store default output format

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index e3ae8b0..b3e51e6 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -68,7 +68,7 @@ enumitem
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command bibtex
 \index_command default
@@ -15996,8 +15996,9 @@ View (Other Formats)
 \family default
  or the toolbar button 
 \begin_inset Graphics
-   filename ../images/view-others.png
-   scale 85
+   filename ../images/view-others.svgz
+   lyxscale 15
+   height 12pt
groupId toolbarbuttons
 
 \end_inset
@@ -40052,8 +40053,9 @@ Synchronize with Output
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-   filename ../images/view-others.png
-   scale 85
+   filename ../images/view-others.svgz
+   lyxscale 15
+   height 12pt
groupId toolbarbuttons
 
 \end_inset
@@ -40084,8 +40086,9 @@ View (Other Formats)
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-   filename ../images/update-others.png
-   scale 85
+   filename ../images/update-others.svgz
+   lyxscale 15
+   height 12pt
groupId toolbarbuttons
 
 \end_inset
@@ -43257,8 +43260,9 @@ Single close-tab button
 \family sans
 
 \begin_inset Graphics
-   filename ../images/closetab.png
-   scale 75
+   filename ../images/closetab.svgz
+   lyxscale 30
+   height 12pt
 
 \end_inset
 
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index ff9f6d6..19bc188 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -68,7 +68,7 @@ enumitem
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command bibtex
 \index_command default
@@ -8498,14 +8498,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
 
@@ -8518,7 +8516,6 @@ Las dos  líneas siguientes están vacías:
 \end_layout
 
 \begin_layout Verbatim
-
 Casi todo está permitido en entorno Literal:"%&$§#~'`
 \backslash
 }][{|
@@ -8548,7 +8545,6 @@ with the difference that spaces appear in the output as 
the character '
 \end_layout
 
 \begin_layout Verbatim
-
 Esto es entorno Literal*.
 \end_layout

[LyX/master] Japanese UserGuide.lyx: make document compilable without PNGs

2015-12-08 Thread Uwe Stöhr 
commit a9549c036e3fbfdca37204f97230c2307f7ca02a
Author: Uwe Stöhr 
Date:   Wed Dec 9 02:22:48 2015 +0100

Japanese UserGuide.lyx: make document compilable without PNGs

also some small corrections and adjustments

diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 6e3370f..1c1be18 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -1519,43 +1519,35 @@ reference "sec:書誌情報"
 \end_layout
 
 \begin_layout Standard
-\begin_inset Graphics
-   filename ../../images/reload.png
-
+\begin_inset Info
+type  "icon"
+arg   "reload"
 \end_inset
 
 ボタンは、(通常必要でないはずですが)目次を再描画します。その隣のボタンは、節の文書中の位置を変えるためのボタンです。
-\begin_inset Graphics
-   filename ../../images/down.png
-   scale 85
-   groupId toolbarbuttons
-
+\begin_inset Info
+type  "icon"
+arg   "outline-down"
 \end_inset
 
 および
-\begin_inset Graphics
-   filename ../../images/up.png
-   scale 85
-   groupId toolbarbuttons
-
+\begin_inset Info
+type  "icon"
+arg   "outline-up"
 \end_inset
 
 
を使うと、節の文書中の位置が、前方に移動したり後方に移動したりします。つまり、例えば第2.5節を、第2.4節の前に持っていったり第2.6節の後に移動したりすることがで
 きるわけです。それに伴い、\SpecialChar LyX
 は、節番号を自動的に新しい順序に振り直してくれます。
-\begin_inset Graphics
-   filename ../../images/outline-out.png
-   scale 85
-   groupId toolbarbuttons
-
+\begin_inset Info
+type  "icon"
+arg   "outline-out"
 \end_inset
 
 ないし
-\begin_inset Graphics
-   filename ../../images/outline-in.png
-   scale 85
-   groupId toolbarbuttons
-
+\begin_inset Info
+type  "icon"
+arg   "outline-in"
 \end_inset
 
 ボタン(または対応する
@@ -7164,12 +7156,14 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 これは無調整(verbatim)環境です。
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 この下の2行は空白行です。
 \end_layout
 
@@ -7182,6 +7176,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 右記の各文字を始め、ほぼすべての文字が使えます。例："%&$§#~'`
 \backslash
 }][{|
@@ -7207,6 +7202,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -14056,8 +14052,9 @@ reference "sec:出力"
 \family default
 かツールバーボタン
 \begin_inset Graphics
-   filename ../../images/view-others.png
-   scale 85
+   filename ../../images/view-others.svgz
+   lyxscale 15
+   height 12pt
groupId toolbarbuttons
 
 \end_inset
@@ -15574,18 +15571,7 @@ status open
 \family sans
 ファイル\SpecialChar menuseparator
 書き出し\SpecialChar menuseparator
-LaTe
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X
+LaTeX
 \begin_inset space ~
 \end_inset
 
@@ -15658,11 +15644,9 @@ status collapsed
 
 \begin_layout Standard
 注釈は、ツールバーボタン
-\begin_inset Graphics
-   filename ../../images/note-insert.png
-   scale 85
-   scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "note-insert"
 \end_inset
 
 か、
@@ -26440,18 +26424,7 @@ name "subsec:TeXコード枠"
 コード枠は、
 \family sans
 挿入\SpecialChar menuseparator
-Te
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-Xコード
+TeXコード
 \family default
 メニューかツールバーボタン
 \begin_inset Info
@@ -26663,18 +26636,7 @@ latexはつけじ@\SpecialChar LaTeX
 \family sans
 文書\SpecialChar menuseparator
 設定\SpecialChar menuseparator
-LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eXプリアンブル
+LaTeXプリアンブル
 \family default
 メニュー)で
 \end_layout
@@ -27273,18 +27235,7 @@ status open
 コードで入力する必要があります(
 \family sans
 挿入\SpecialChar menuseparator
-Te
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-Xコード
+TeXコード
 \family default
 メニュー)。
 \end_layout
@@ -27439,19 +27390,7 @@ footheight
 レビューしてみてください。それから、
 \family sans
 文書\SpecialChar menuseparator
-La
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-\SpecialChar TeX
-ログ
+LaTeXログ
 \family default
 メニューから\SpecialChar LaTeX
 ログファイルを開き、次の警告ボタンを押して、
@@ -29517,18 +29456,7 @@ arg   "note-insert"
 \family sans
 挿入\SpecialChar menuseparator
 注釈\SpecialChar menuseparator
-Ly
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-X注釈
+LyX注釈
 \end_layout
 
 \end_inset
@@ -30069,22 +29997,7 @@ CJK
 \begin_inset space ~
 \end_inset
 
-L
-\family default
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\family sans
-yX
+LyX
 \family default
  日中韓(CJK)版\SpecialChar LyX
  1.4.xの形式
@@ -30153,18 +30066,7 @@ DVI
 \begin_inset space ~
 \end_inset
 
-(LuaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX)
+(LuaTeX)
 \family default
  プログラム
 \family typewriter
@@ -30278,39 +30180,13 @@ MathML
 \begin_layout Description
 
 \family sans
-LaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eX
+LaTeX
 \begin_inset space ~
 \end_inset
 
 (
 \family default
-LuaT
-\family sans
-