UserGuide.lyx: document new possible text colors

@Richard: as you can see the additional lines in Verbatim are not added by lyx2lyx

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 7f5c99c91f6d848aa163563d56db572c0f8fbe65..50eba64058bb32510f4c20e2a44c7b3faeb057f2 100644 (file)
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8174,12 +8174,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
 
@@ -8192,6 +8194,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8215,6 +8218,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -14076,9 +14080,53 @@ Cyan
 \family sans
 Magenta
 \family default
- and 
+, 
 \family sans
 Yellow
+\family default
+, 
+\family sans
+Brown
+\family default
+, 
+\family sans
+Darkgray
+\family default
+, 
+\family sans
+Gray
+\family default
+, 
+\family sans
+Lightgray
+\family default
+, 
+\family sans
+Lime
+\family default
+, 
+\family sans
+Orange
+\family default
+, 
+\family sans
+Olive
+\family default
+, 
+\family sans
+Pink
+\family default
+, 
+\family sans
+Purple
+\family default
+, 
+\family sans
+Teal
+\family default
+ and 
+\family sans
+Violet
 \family default
  text.
 \begin_inset Index idx
@@ -14090,7 +14138,7 @@ Color ! Text
 
 \end_inset
 
-
+ 
 \end_layout
 
 \begin_layout Labeling

diff --git a/lib/doc/attic/Changelog-UserGuide-LyX_22x.txt b/lib/doc/attic/Changelog-UserGuide-LyX_22x.txt
index 9fcbb37aaece4ef29e96e7110a816515c3d58fc1..5969778ed3a34410adc4b32caf3221aa76040486 100644 (file)
--- a/lib/doc/attic/Changelog-UserGuide-LyX_22x.txt
+++ b/lib/doc/attic/Changelog-UserGuide-LyX_22x.txt
@@ -3,6 +3,7 @@
 - sec. 3.3.10.1 (Japanese only) changed sentence
 - sec. 3.3.10.2 new paragraph about Verbatim*
 - sec. 3.4.6: changed paragraph
+- sec. 3.7.6: new color names
 - sec. 6.7.1: new paragraph
 - sec. A.6.10: new sentence
 - sec. B.9: (Japanese only) changed sentence

diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 46d9f602cd9181fcec2c929be85a0a4367192c17..af6065a9ec76faa2fcd4f90def4a75a5e29d624a 100644 (file)
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -8674,10 +8674,12 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim
+
 Dies ist Unformatiert.
 \end_layout
 
 \begin_layout Verbatim
+
 Die folgenden 2 Zeilen sind leer:
 \end_layout
 
@@ -8690,6 +8692,7 @@ Die folgenden 2 Zeilen sind leer:
 \end_layout
 
 \begin_layout Verbatim
+
 Fast alles ist in Unformatiert erlaubt:"%&$§#~'`
 \backslash
 }][{|
@@ -8713,6 +8716,7 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim*
+
 Dies ist Unformatiert*.
 \end_layout
 
@@ -14878,9 +14882,53 @@ Cyan
 \family sans
 Magenta
 \family default
- und 
+, 
 \family sans
 Gelb
+\family default
+, 
+\family sans
+Braun
+\family default
+, 
+\family sans
+Dunkelgrau
+\family default
+, 
+\family sans
+Grau
+\family default
+, 
+\family sans
+Hellgrau
+\family default
+, 
+\family sans
+Limette
+\family default
+, 
+\family sans
+Orange
+\family default
+, 
+\family sans
+Olivgrün
+\family default
+, 
+\family sans
+Pink
+\family default
+, 
+\family sans
+Purpur
+\family default
+, 
+\family sans
+Teal
+\family default
+ und 
+\family sans
+Violett
 \family default
  wählen.
 \end_layout

diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index af93d8121f0be4cf9f30534d6d4eb130cf8f248a..1958d163257efc9df5e50df4d70c3b077da86271 100644 (file)
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8555,12 +8555,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
 
@@ -8573,6 +8575,7 @@ Las dos  líneas siguientes están vacías:
 \end_layout
 
 \begin_layout Verbatim
+
 Casi todo está permitido en entorno Literal:"%&$§#~'`
 \backslash
 }][{|
@@ -8602,6 +8605,7 @@ with the difference that spaces appear in the output as the character '
 \end_layout
 
 \begin_layout Verbatim
+
 Esto es entorno Literal*.
 \end_layout
 
@@ -14646,10 +14650,58 @@ Cian
 \family sans
 Magenta
 \family default
- y 
+, 
 \family sans
 Amarillo
 \family default
+, 
+\family sans
+\lang english
+Brown
+\family default
+, 
+\family sans
+Darkgray
+\family default
+, 
+\family sans
+Gray
+\family default
+, 
+\family sans
+Lightgray
+\family default
+, 
+\family sans
+Lime
+\family default
+, 
+\family sans
+Orange
+\family default
+, 
+\family sans
+Olive
+\family default
+, 
+\family sans
+Pink
+\family default
+, 
+\family sans
+Purple
+\family default
+, 
+\family sans
+Teal
+\family default
+\lang spanish
+ y 
+\family sans
+\lang english
+Violet
+\family default
+\lang spanish
 .
 \begin_inset Index idx
 status collapsed

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 421fadeb4e5b501f1421eb6e452ca4e9df89bf82..121e235bc5348dbb8d3377590175ebdabc9e21c3 100644 (file)
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -8716,12 +8716,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
 
@@ -8734,6 +8736,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8759,6 +8762,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -15255,10 +15259,58 @@ Cyan
 \family sans
 Magenta
 \family default
- et 
+, 
 \family sans
 Jaune
 \family default
+, 
+\family sans
+\lang english
+Brown
+\family default
+, 
+\family sans
+Darkgray
+\family default
+, 
+\family sans
+Gray
+\family default
+, 
+\family sans
+Lightgray
+\family default
+, 
+\family sans
+Lime
+\family default
+, 
+\family sans
+Orange
+\family default
+, 
+\family sans
+Olive
+\family default
+, 
+\family sans
+Pink
+\family default
+, 
+\family sans
+Purple
+\family default
+, 
+\family sans
+Teal
+\family default
+\lang french
+ et 
+\family sans
+\lang english
+Violet
+\family default
+\lang french
 
 \begin_inset Index idx
 status collapsed

diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 544c512de38f025e45b2945fd4b1d28b67e2a692..b14b05a5a178d30589a2f4f2d1cb6fea5672de02 100644 (file)
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -7180,12 +7180,14 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 これは無調整(verbatim)環境です。
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 この下の2行は空白行です。
 \end_layout
 
@@ -7198,6 +7200,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 右記の各文字を始め、ほぼすべての文字が使えます。例："%&$§#~'`
 \backslash
 }][{|
@@ -7223,6 +7226,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -12615,7 +12619,54 @@ This is the Small caps font shape
 \family sans
 本文
 \family default
-に指定した既定色が使用されることを意味します。
+に指定した既定色が使用されることを意味します
+\lang english
+, 
+\family sans
+Brown
+\family default
+, 
+\family sans
+Darkgray
+\family default
+, 
+\family sans
+Gray
+\family default
+, 
+\family sans
+Lightgray
+\family default
+, 
+\family sans
+Lime
+\family default
+, 
+\family sans
+Orange
+\family default
+, 
+\family sans
+Olive
+\family default
+, 
+\family sans
+Pink
+\family default
+, 
+\family sans
+Purple
+\family default
+, 
+\family sans
+Teal
+\family default
+ and 
+\family sans
+Violet
+\family default
+\lang japanese
+。
 \begin_inset Index idx
 status collapsed