From 61ebacb01f1bfae92740458face7d67071a4b96d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Mon, 20 Nov 2017 22:59:02 +0100
Subject: [PATCH] UserGuide.lyx: describe cross out text feature

- also remove a meanwhile unnecessary hint
---
 lib/doc/Changelog-UserGuide-LyX_23x.txt |   1 +
 lib/doc/UserGuide.lyx                   | 120 ++++++-----------------
 lib/doc/de/UserGuide.lyx                | 121 +++++-------------------
 lib/doc/es/UserGuide.lyx                | 118 +++++------------------
 lib/doc/fr/UserGuide.lyx                | 118 +++++++----------------
 lib/doc/ja/UserGuide.lyx                |  97 +++++--------------
 6 files changed, 138 insertions(+), 437 deletions(-)

diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index c497490cb7..ba998cf280 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -15,6 +15,7 @@ first step (not German, not Japanese):
 - sec. C.1.2.3 new sentence (not French)
 
 second step
+- sec. 3.7.6: new feature to cross out text
 - sec. 4.6.2: Japanese only: untranslated image captions
 - sec. C.2.2.1 new paragraph (not French, not German)
 
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 8f3926f268..773ad7db8c 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8336,12 +8336,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
 
@@ -8354,6 +8356,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8377,6 +8380,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -14679,7 +14683,11 @@ Use this only if a journal absolutely insists on it.
 \labelwidthstring 00.00.0000
 
 \family sans
-Strikeout
+Strike
+\begin_inset space ~
+\end_inset
+
+out
 \family default
  
 \strikeout on
@@ -14703,6 +14711,27 @@ This is frequently used to indicate an older version of text that has been
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
 
+\family sans
+Cross
+\begin_inset space ~
+\end_inset
+
+out
+\family default
+ 
+\xout on
+This is text with Cross out on.
+\xout default
+
+\begin_inset Newline newline
+\end_inset
+
+This is used to make text hardly readable.
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+
 \family sans
 Noun
 \family default
@@ -30284,95 +30313,6 @@ The previous entry need not be a real existing entry.
  See the next subsection for an example.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-In some cases the index entry order is not correct when you are using the
- program 
-\family sans
-makeindex 
-\family default
-to generate the index (see section
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:Index-Program"
-
-\end_inset
-
-).
- 
-\family sans
-makeindex
-\family default
- would for example print the index entry for the \SpecialChar LaTeX
--package aeguill in section
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:Document-Font"
-
-\end_inset
-
- after the index entries of the other \SpecialChar LaTeX
--packages although all these index
- commands start with 
-\begin_inset Quotes eld
-\end_inset
-
-
-\series bold
-\SpecialChar LaTeX
--packages !
-\series default
- 
-\begin_inset Quotes erd
-\end_inset
-
-.
- The reason is that the index entry for aeguill is in a footnote.
- To fix this 
-\family sans
-makeindex
-\family default
- bug, add these commands to the preamble of your document:
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-let
-\backslash
-OrgIndex
-\backslash
-index
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-renewcommand*{
-\backslash
-index}[1]{
-\backslash
-OrgIndex{#1}}
-\end_layout
-
 \begin_layout Subsection
 Index Entry Layout
 \begin_inset Index idx
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 08aa3a982e..3ab6faacca 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -14824,9 +14824,8 @@ Unterstrichen
  
 \bar under
 Dies ist unterstrichener Text.
-
 \bar default
- 
+
 \begin_inset Newline newline
 \end_inset
 
@@ -14867,9 +14866,8 @@ unterstrichen
  
 \uuline on
 Dies ist doppelt unterstrichener Text.
-
 \uuline default
- 
+
 \begin_inset Newline newline
 \end_inset
 
@@ -14902,9 +14900,8 @@ unterstrichen
  
 \uwave on
 Dies ist wellig unterstrichener Text.
-
 \uwave default
- 
+
 \begin_inset Newline newline
 \end_inset
 
@@ -14928,16 +14925,12 @@ Verwenden Sie dies nur wenn ein Journal unbedingt darauf besteht.
 \labelwidthstring 00.00.0000
 
 \family sans
-Durchgestrichen
+Durchgestrichen 
 \family default
-\bar under
- 
-\bar default
 \strikeout on
 Dies ist durchgestrichener Text.
-
 \strikeout default
- 
+
 \begin_inset Newline newline
 \end_inset
 
@@ -14949,13 +14942,29 @@ Strg+Umschalt+O
 \begin_inset Newline newline
 \end_inset
 
-Dies wird oft verwendet um eine alte Version eines Textes zu kennzeichnen,
+Dies wird oft verwendet, um eine alte Version eines Textes zu kennzeichnen,
  der inzwischen geändert wurde.
 \end_layout
 
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
 
+\family sans
+Durchgekreuzt 
+\family default
+\xout on
+Dies ist durchgekreuzter Text.
+\xout default
+
+\begin_inset Newline newline
+\end_inset
+
+Dies wird verwendet, um Text schwer lesbar zu machen.
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+
 \family sans
 Eigenname/Kapitälchen
 \family default
@@ -29971,92 +29980,6 @@ Der vorige Eintrag muss kein existierender Eintrag sein.
  siehe den nächsten Unterabschnitt für ein Beispiel.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-In einigen Fällen ist die Stichwort-Reihenfolge inkorrekt wenn das Programm
- 
-\family sans
-makeindex 
-\family default
-verwendet wird um das Stichwortverzeichnis zu erzeugen (siehe Kap.
-\begin_inset space \thinspace{}
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:Stichwort-Programm"
-
-\end_inset
-
-).
- 
-\family sans
-makeindex
-\family default
- gibt zum Beispiel das Stichwort für das \SpecialChar LaTeX
--Paket aeguill in Kap.
-\begin_inset space \thinspace{}
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:Dokumentschrift-und-Schriftgröße"
-
-\end_inset
-
- nach den Stichworten der anderen \SpecialChar LaTeX
--Pakete aus, obwohl all diese Stichwort-Befehl
-e mit 
-\begin_inset Quotes gld
-\end_inset
-
-
-\series bold
-\SpecialChar LaTeX
--Paket ! 
-\series default
-“ beginnen.
- Der Grund ist, dass sich das Stichwort für aeguill in einer Fußnote befindet.
- Um diesen Fehler von 
-\family sans
-makeindex
-\family default
- zu umgehen, kann man diese Befehle zum \SpecialChar LaTeX
--Vorspann des Dokuments hinzufügen:
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-let
-\backslash
-OrgIndex
-\backslash
-index
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-renewcommand*{
-\backslash
-index}[1]{
-\backslash
-OrgIndex{#1}}
-\end_layout
-
 \begin_layout Subsection
 Stichwort-Formatierung
 \begin_inset Index idx
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index e363a00625..11dff18c13 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8559,12 +8559,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
 
@@ -8577,6 +8579,7 @@ Las dos  líneas siguientes están vacías:
 \end_layout
 
 \begin_layout Verbatim
+
 Casi todo está permitido en entorno Literal:"%&$§#~'`
 \backslash
 }][{|
@@ -8601,6 +8604,7 @@ con la diferencia de que los espacios aparecen en la salida como el carácter
 \end_layout
 
 \begin_layout Verbatim*
+
 Esto es entorno Literal*.
 \end_layout
 
@@ -15016,14 +15020,33 @@ Esto es un texto tachado.
 \family sans
 Ctrl+Mayúsculas+O
 \family default
-).
+)
 \begin_inset Newline newline
 \end_inset
 
 Se usa frecuentemente para señalar la versión antigua de un texto cambiado.
+\end_layout
 
-\strikeout on
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+
+\family sans
+\lang english
+Cross
+\begin_inset space ~
+\end_inset
+
+out
+\family default
  
+\xout on
+This is text with Cross out on.
+\xout default
+
+\begin_inset Newline newline
+\end_inset
+
+This is used to make text hardly readable.
 \end_layout
 
 \begin_layout Labeling
@@ -15045,7 +15068,7 @@ Alt+C
 
 C
 \family default
-).
+)
 \noun on
 
 \begin_inset Newline newline
@@ -31277,95 +31300,6 @@ reference "sec:Indice-alfabético"
 
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-En algunos casos, si estás usando el programa 
-\family sans
-makeindex
-\family default
- para generar el índice, el orden de entradas en el índice no es correcto
- (véase la sec.
-\begin_inset space \thinspace{}
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:Programas-para-índice"
-
-\end_inset
-
-).
- Por ejemplo, 
-\family sans
-makeindex
-\family default
- podría imprimir la entrada de índice para el paquete \SpecialChar LaTeX
- aeguill, en la sec.
-\begin_inset space \thinspace{}
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:Tipografía-del-documento"
-
-\end_inset
-
-, después de las entradas de índice de los demás paquetes \SpecialChar LaTeX
-, aunque todos
- estos comandos de índice empiezan con 
-\begin_inset Quotes eld
-\end_inset
-
-
-\series bold
-\SpecialChar LaTeX
-, paquetes ! 
-\series default
-
-\begin_inset Quotes erd
-\end_inset
-
-.
- La razón es que la entrada de índice para aeguill está en una nota al pie.
- Para arreglar este fallo de 
-\family sans
-makeindex
-\family default
-, añade estos comandos en el preámbulo del documento:
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-let
-\backslash
-OrgIndex
-\backslash
-index
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-renewcommand*{
-\backslash
-index}[1]{
-\backslash
-OrgIndex{#1}}
-\end_layout
-
 \begin_layout Subsection
 Formato de entradas de índice
 \begin_inset Index idx
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index adee38f4df..f46b05662f 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -9030,12 +9030,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
 
@@ -9048,6 +9050,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -9080,6 +9083,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -15853,7 +15857,35 @@ type  "shortcut"
 arg   "font-strikeout"
 \end_inset
 
-) Utilisé fréquemment pour marquer une version ancienne qui a changé depuis;
+)
+\begin_inset Newline newline
+\end_inset
+
+Utilisé fréquemment pour marquer une version ancienne qui a changé depuis;
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+
+\family sans
+\lang english
+Cross
+\begin_inset space ~
+\end_inset
+
+out
+\family default
+ 
+\xout on
+This is text with Cross out on.
+\xout default
+
+\begin_inset Newline newline
+\end_inset
+
+This is used to make text hardly readable
+\lang french
+;
 \end_layout
 
 \begin_layout Labeling
@@ -32214,90 +32246,6 @@ L'entrée précédente n'a pas besoin d'être une vraie entrée, présente dans
  Voyez la sous-section suivante pour un exemple.
 \end_layout
 
-\begin_layout Standard
-Dans certains cas l'ordre des entrées d'index n'est pas correct quand vous
- utilisez le programme 
-\family sans
-makeindex 
-\family default
-pour générer l'index (voir la section
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:Programme-d'indexation"
-
-\end_inset
-
-).
- 
-\family sans
-makeindex
-\family default
- va par exemple imprimer l'entrée d'index pour le paquetage \SpecialChar LaTeX
- aeguill de
- la section
-\begin_inset space \thinspace{}
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:Document-Polices"
-
-\end_inset
-
- après les entrées des autres paquetages \SpecialChar LaTeX
- bien que toutes ces entrées pour
- des commandes commencent toutes par 
-\begin_inset Quotes eld
-\end_inset
-
-
-\series bold
-Paquetages \SpecialChar LaTeX
- !
-\series default
- 
-\begin_inset Quotes eld
-\end_inset
-
-.
- La raison est que l'entrée d'index pour aeguill se trouve dans une note
- de bas de page.
- Pour contourner ce bogue de 
-\family sans
-makeindex
-\family default
-, ajoutez ces commandes au préambule de votre document :
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-let
-\backslash
-OrgIndex
-\backslash
-index
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-renewcommand*{
-\backslash
-index}[1]{
-\backslash
-OrgIndex{#1}}
-\end_layout
-
 \begin_layout Subsection
 Typographie des entrées d'index
 \begin_inset Index idx
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 05fcee1f3a..dfd0f7185c 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -7173,12 +7173,14 @@ Space
 \end_layout
 
 \begin_layout Verbatim
+
 これは原文儘(verbatim)環境です．
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 この下の2行は空白行です．
 \end_layout
 
@@ -7191,6 +7193,7 @@ Space
 \end_layout
 
 \begin_layout Verbatim
+
 右記の各文字を始め，ほぼすべての文字が使えます．例："%&$§#~'`
 \backslash
 }][{|
@@ -7213,6 +7216,7 @@ Space
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -12740,6 +12744,28 @@ arg   "font-strikeout"
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
 
+\family sans
+\lang english
+Cross
+\begin_inset space ~
+\end_inset
+
+out
+\family default
+ 
+\xout on
+This is text with Cross out on.
+\xout default
+
+\begin_inset Newline newline
+\end_inset
+
+This is used to make text hardly readable.
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+
 \family sans
 名詞体
 \family default
@@ -25839,77 +25865,6 @@ is@maison
 とします．前項目は実際に存在する項目でなくてもかまわないので，\SpecialChar LaTeX
 に項目順序を告げる単語であればどんな単語を使ってもかまいません．例として次の小節を参照してください
 ．
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-索引の生成に
-\family sans
-makeindex
-\family default
-プログラムを使用している場合には，索引項目の順序が正しくないことがあります(第
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:索引プログラム"
-
-\end_inset
-
-節を参照)．たとえば，
-\family sans
-makeindex
-\family default
-は，第
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:文書フォント"
-
-\end_inset
-
-節のaeguill \SpecialChar LaTeX
-パッケージの索引項目を，他の\SpecialChar LaTeX
-パッケージの索引コマンドも「
-\series bold
-\SpecialChar LaTeX
-パッケージ ! 
-\series default
-」で始まっているにもかかわらず，これらの項目の後に印字してしまいます．そのわけは，aeguillの索引項目が脚註にあるからです．この
-\family sans
-makeindex
-\family default
-のバグを修正するには，使用中の文書のプリアンブルに
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-let
-\backslash
-OrgIndex
-\backslash
-index
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-
-\backslash
-renewcommand*{
-\backslash
-index}[1]{
-\backslash
-OrgIndex{#1}}
-\series default
-
-\begin_inset Newline newline
-\end_inset
-
-というコマンドを書き加えて下さい．
 \end_layout
 
 \begin_layout Subsection
-- 
2.39.5