commit 964fb09bafabbdd531c4ac28c20c088ee25e811e
Author: Uwe Stöhr <[email protected]>
Date: Thu Jul 27 00:03:33 2017 +0200
UserGuide.lyx: accept and distribute some more additions
---
lib/doc/Changelog-UserGuide-LyX_23x.txt | 1 +
lib/doc/UserGuide.lyx | 107 +++++++-----------------------
lib/doc/de/UserGuide.lyx | 20 +++++-
lib/doc/es/UserGuide.lyx | 87 +++++++++++++++++++++----
lib/doc/fr/UserGuide.lyx | 92 +++++++++++++++++++++------
lib/doc/ja/UserGuide.lyx | 73 ++++++++++++++++++---
6 files changed, 250 insertions(+), 130 deletions(-)
diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index fa5dfb1..6778a21 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -4,6 +4,7 @@ Modified:
first step:
- sec. 6.1: new reference format and new options
+- sec. C.1.2.3 new sentence
For LyX 2.2.3:
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index ef36d36..ba1f99f 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -146,7 +146,6 @@ enumitem
\html_css_as_file 0
\html_be_strict true
\author -712698321 "Jürgen Spitzmüller"
-\author 274215730 "scott"
\author 424524441 "rgheck"
\end_header
@@ -28270,41 +28269,8 @@ name "sec:Bibliography"
\begin_layout Standard
There are two ways of generating the bibliography in a \SpecialChar LyX
-
-\change_inserted -712698321 1483880152
-
-\change_deleted -712698321 1483880151
--
-\change_unchanged
-document.
- You can include a bibliography database,
-\change_deleted -712698321 1483880276
-
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Known under the name
-\begin_inset Quotes eld
-\end_inset
-
-Bib\SpecialChar TeX
- database
-\begin_inset Quotes erd
-\end_inset
-
-.
-\end_layout
-
-\end_inset
-
-
-\change_unchanged
- which is explained in
-\change_deleted -712698321 1483883190
-the next subsection
-\change_inserted -712698321 1483890955
-sec.
+ document.
+ You can include a bibliography database, which is explained in sec.
\begin_inset space ~
\end_inset
@@ -28318,28 +28284,12 @@ noprefix "false"
\end_inset
-
-\change_unchanged
, or you can insert the bibliography manually, using the paragraph environment
\family sans
Bibliography
\family default
-, which
-\change_deleted -712698321 1483883190
-wa
-\change_inserted -712698321 1483883190
-i
-\change_unchanged
-s described in
-\change_inserted -712698321 1483883197
-the following
-\change_unchanged
-section
-\change_inserted -712698321 1483890942
- (but see also sec.
-\change_unchanged
-
+, which is described in the following section (but see also sec.
\begin_inset space ~
\end_inset
@@ -28350,11 +28300,7 @@ reference "subsec:Biblio_environment"
\end_inset
-
-\change_inserted -712698321 1483883212
-)
-\change_unchanged
-.
+).
If you want anything other than the numerical citations that are used in
this document,
\change_deleted -712698321 1483883190
@@ -28405,8 +28351,7 @@ Bibliography
\end_layout
\begin_layout Subsection
-
-\change_inserted -712698321 1483885645
+The Bibliography Environment
\begin_inset CommandInset label
LatexCommand label
name "subsec:The-Bibliography-Environment"
@@ -28414,8 +28359,6 @@ name "subsec:The-Bibliography-Environment"
\end_inset
-\change_unchanged
-The Bibliography Environment
\end_layout
\begin_layout Standard
@@ -29120,7 +29063,7 @@ Inserting a citation reference works as described in
section
\begin_inset CommandInset ref
LatexCommand ref
-reference "subsec:The-Bibliography-Environment"
+reference "subsec:The-Bibliography-Environmentfg"
plural "false"
caps "false"
noprefix "false"
@@ -29641,7 +29584,7 @@ Natbib
\begin_inset CommandInset ref
LatexCommand ref
-reference "subsec:The-Bibliography-Environment"
+reference "subsec:The-Bibliography-Environmentfg"
\end_inset
@@ -46130,12 +46073,8 @@ arg "closetab"
\family default
) at the right side of the tab bar to close tabs.
Otherwise every document tab has its own close button.
-
-\change_inserted 274215730 1469338548
- Regardless of this option, one may always close a tab by middle-clicking
+ Regardless of this option, one can always close a tab by middle-clicking
it in the tab bar.
-\change_unchanged
-
\end_layout
\begin_layout Standard
@@ -49551,13 +49490,9 @@
http://www.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf
\end_inset
-\change_inserted -712698321 1483884806
-
\end_layout
\begin_layout Bibliography
-
-\change_inserted -712698321 1483884882
\begin_inset CommandInset bibitem
LatexCommand bibitem
key "Biblatex"
@@ -49574,11 +49509,23 @@ literal "false"
\end_inset
- of the
-\family sans
-Biblatex
-\family default
- package:
+ of the \SpecialChar LaTeX
+-package
+\series bold
+biblatex
+\series default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+\SpecialChar LaTeX
+-packages ! biblatex
+\end_layout
+
+\end_inset
+
+:
\begin_inset Newline newline
\end_inset
@@ -49588,16 +49535,12 @@ status collapsed
\begin_layout Plain Layout
-\change_inserted -712698321 1483884888
-
http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf
\end_layout
\end_inset
-\change_unchanged
-
\end_layout
\begin_layout Bibliography
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 58f9a6d..101524b 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -47170,10 +47170,22 @@ literal "false"
\end_inset
- des Pakets
-\family sans
-Biblatex
-\family default
+ des \SpecialChar LaTeX
+-Pakets
+\series bold
+biblatex
+\series default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+\SpecialChar LaTeX
+-Paket ! biblatex
+\end_layout
+
+\end_inset
+
:
\begin_inset Newline newline
\end_inset
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index c33344e..ceccd8b 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -27936,44 +27936,46 @@ name "sec:Bibliografía"
\begin_layout Standard
Hay dos formas de generar la bibliografía en un documento \SpecialChar LyX
.
- Puedes incluir una base de datos bibliográficos
-\begin_inset Foot
-status collapsed
+ Puedes incluir una base de datos bibliográficos, que se explica en la sección
+\begin_inset space ~
+\end_inset
-\begin_layout Plain Layout
-conocida por «bases de datos Bib\SpecialChar TeX
-»
-\end_layout
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "subsec:El-entorno-Bibliografía"
\end_inset
-, que se explica enseguida, o insertarla manualmente usando el entorno de
- párrafo
+, o insertarla manualmente usando el entorno de párrafo
\family sans
Bibliografía,
\family default
- descrito en la sección
+ descrito enseguida (véase también la sección
\begin_inset space ~
\end_inset
-\begin_inset space \thinspace{}
-\end_inset
-
-
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:Biblio_entorno"
\end_inset
-.
+).
Si quieres cosas distintas a citas numéricas, usadas en este documento,
como citas autor-año, debes usar una base de datos bibliográficos.
\end_layout
\begin_layout Subsection
El entorno Bibliografía
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:El-entorno-Bibliografía"
+
+\end_inset
+
+
\end_layout
\begin_layout Standard
@@ -43784,6 +43786,10 @@ arg "closetab"
\family default
) en el lado derecho de la barra de pestañas para cerrarlas.
De lo contrario, cada pestaña de documento tendrá su botón de cierre.
+
+\lang english
+Regardless of this option, one can always close a tab by middle-clicking
+ it in the tab bar.
\end_layout
\begin_layout Standard
@@ -47223,6 +47229,57 @@
http://www.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf
\begin_layout Bibliography
\begin_inset CommandInset bibitem
LatexCommand bibitem
+key "Biblatex"
+literal "true"
+
+\end_inset
+
+
+\begin_inset CommandInset href
+LatexCommand href
+name "Documentación"
+target "http://www.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf";
+literal "false"
+
+\end_inset
+
+ del paquete \SpecialChar LaTeX
+
+\series bold
+biblatex
+\series default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+\SpecialChar LaTeX
+, paquetes ! biblatex
+\end_layout
+
+\end_inset
+
+:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Bibliography
+\begin_inset CommandInset bibitem
+LatexCommand bibitem
key "makeindex"
literal "true"
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 5df7433..4391d78 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -28839,7 +28839,7 @@ options
\begin_layout Section
Annexes
\begin_inset Index idx
-status open
+status collapsed
\begin_layout Plain Layout
Annexes
@@ -28938,32 +28938,24 @@ name "sec:Bibliographie"
\begin_layout Standard
Il y a deux façons de créer une bibliographie dans un document \SpecialChar LyX
.
- Vous pouvez utiliser une base de données bibliographique
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Connue sous le nom de base de données
-\begin_inset Quotes cld
+ Vous pouvez utiliser une base de données bibliographique, ce qui est expliqué
+ dans la section
+\begin_inset space ~
\end_inset
-Bib\SpecialChar TeX
-\begin_inset Quotes crd
-\end_inset
-
-.
-\end_layout
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "subsec:L'environnement-Bibliographie"
\end_inset
-, ce qui est expliqué dans la sous-section suivante, ou vous pouvez entrer
- la bibliographie à la main.
+, ou vous pouvez entrer la bibliographie à la main.
Pour la seconde méthode, l'environnement de paragraphe
\family sans
Bibliographie
\family default
-, décrit section
+, décrit suivante (voir ausi section
\begin_inset space ~
\end_inset
@@ -28974,7 +28966,7 @@ reference "subsec:Environnement-biblio"
\end_inset
-, sera utilisé.
+), sera utilisé.
Si vous voulez avoir autre chose que les citations numériques que vous
pouvez voir dans ce document, comme par exemple des citations auteur-année,
vous devez utiliser une base de données bibliographique.
@@ -28982,6 +28974,13 @@ reference "subsec:Environnement-biblio"
\begin_layout Subsection
L'environnement Bibliographie
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:L'environnement-Bibliographie"
+
+\end_inset
+
+
\end_layout
\begin_layout Standard
@@ -45405,6 +45404,10 @@ arg "closetab"
\family default
) à la droite de la barre des onglets pour fermer ceux-ci.
Sinon, chaque document a son propre bouton de fermeture.
+
+\lang english
+Regardless of this option, one can always close a tab by middle-clicking
+ it in the tab bar.
\end_layout
\begin_layout Standard
@@ -48841,8 +48844,6 @@ literal "false"
\end_inset
-\lang english
-
\begin_inset Flex URL
status collapsed
@@ -49064,6 +49065,57 @@
http://www.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf
\begin_layout Bibliography
\begin_inset CommandInset bibitem
LatexCommand bibitem
+key "Biblatex"
+literal "true"
+
+\end_inset
+
+
+\begin_inset CommandInset href
+LatexCommand href
+name "Documentation"
+target "http://www.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf";
+literal "false"
+
+\end_inset
+
+ du paquetage \SpecialChar LaTeX
+
+\series bold
+biblatex
+\series default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Paquetages \SpecialChar LaTeX
+ ! biblatex
+\end_layout
+
+\end_inset
+
+:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Bibliography
+\begin_inset CommandInset bibitem
+LatexCommand bibitem
key "makeindex"
literal "true"
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index bc70fa1..42e58a5 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -23254,24 +23254,25 @@ name "sec:書誌情報"
\begin_layout Standard
\SpecialChar LyX
-文書で書誌情報を生成するには，二つの方法があります．次小節で説明するように文献データベース
-\begin_inset Foot
-status collapsed
+文書で書誌情報を生成するには，二つの方法があります．次小節で説明するように文献データベースをインクルードするか
+\lang english
+the following section (but see also sec.
+\begin_inset space ~
+\end_inset
-\begin_layout Plain Layout
-「Bib\SpecialChar TeX
-データベース」として知られています．
-\end_layout
-\end_inset
+\lang japanese
-をインクルードするか，第
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:書誌情報環境"
\end_inset
+
+\lang english
+)
+\lang japanese
節に説明されているように
\family sans
書誌情報
@@ -36742,6 +36743,9 @@ arg "closetab"
\family default
)現れるようになります．無効の場合には，各文書タブごとに閉ボタンが付きます．
+\lang english
+Regardless of this option, one can always close a tab by middle-clicking
+ it in the tab bar.
\end_layout
\begin_layout Standard
@@ -39781,6 +39785,57 @@
http://www.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf
\begin_layout Bibliography
\begin_inset CommandInset bibitem
LatexCommand bibitem
+key "Biblatex"
+literal "true"
+
+\end_inset
+
+\SpecialChar LaTeX
+パッケージ
+\series bold
+biblatex
+\series default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+latexはつけじ@\SpecialChar LaTeX
+パッケージ ! biblatex
+\end_layout
+
+\end_inset
+
+の
+\begin_inset CommandInset href
+LatexCommand href
+name "取扱説明書"
+target "http://www.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf";
+literal "false"
+
+\end_inset
+
+:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Bibliography
+\begin_inset CommandInset bibitem
+LatexCommand bibitem
key "makeindex"
literal "true"
