commit d0eebfd0448926409a27e1b2146a2d047a79dba7
Author: Uwe Stöhr <[email protected]>
Date: Tue Jul 5 02:27:36 2016 +0200
doc files: backport recent changes
---
lib/doc/Changelog-Customization-LyX_22x.txt | 9 ++-
lib/doc/Changelog-Math-LyX_22.txt | 9 ++-
lib/doc/Changelog-UserGuide-LyX_22x.txt | 7 +-
lib/doc/Customization.lyx | 61 +++--------
lib/doc/Math.lyx | 41 +++----
lib/doc/UserGuide.lyx | 117 +++++++++------------
lib/doc/de/Customization.lyx | 81 +++++++++------
lib/doc/de/Math.lyx | 50 +++++++++
lib/doc/es/Customization.lyx | 153 ++++++++------------------
lib/doc/es/Math.lyx | 46 ++++++++
lib/doc/es/UserGuide.lyx | 15 +++-
lib/doc/fr/Customization.lyx | 147 +++++++++-----------------
lib/doc/fr/Math.lyx | 46 ++++++++
lib/doc/fr/UserGuide.lyx | 23 +++--
lib/doc/ja/Customization.lyx | 104 +++++++++----------
lib/doc/ja/Math.lyx | 46 ++++++++
lib/doc/ja/UserGuide.lyx | 32 +++++-
17 files changed, 541 insertions(+), 446 deletions(-)
diff --git a/lib/doc/Changelog-Customization-LyX_22x.txt
b/lib/doc/Changelog-Customization-LyX_22x.txt
index daec976..667d58c 100644
--- a/lib/doc/Changelog-Customization-LyX_22x.txt
+++ b/lib/doc/Changelog-Customization-LyX_22x.txt
@@ -1,4 +1,11 @@
-Modified:
+For LyX 2.2.1:
+
+- sec. 5.3.9: additions in description of "LyxType"
+
+
+For LyX 2.2.0:
+
+Modified:
first step:
- sec. 5.3.4 new sentence for "Requires"
diff --git a/lib/doc/Changelog-Math-LyX_22.txt
b/lib/doc/Changelog-Math-LyX_22.txt
index 1fd71bf..7586874 100644
--- a/lib/doc/Changelog-Math-LyX_22.txt
+++ b/lib/doc/Changelog-Math-LyX_22.txt
@@ -1,13 +1,18 @@
+For LyX 2.2.1:
+
+- sec. 23.1: new note
+
+
+For LyX 2.2.0:
+
In the first step:
Modified:
-
- sec. 15.1: Spanish only: new note behind the table
- sec. 16.1: Spanish only: correct note in the table
- sec. 18.1: Japanese only: updated paragraph
New:
-
- sec. 13.3: new note behind the table
diff --git a/lib/doc/Changelog-UserGuide-LyX_22x.txt
b/lib/doc/Changelog-UserGuide-LyX_22x.txt
index f4dc853..ca0286c 100644
--- a/lib/doc/Changelog-UserGuide-LyX_22x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_22x.txt
@@ -1,4 +1,9 @@
-Modified:
+For LyX 2.2.1:
+
+- sec. 6.11: new sentence
+
+
+For LyX 2.2.0:
in the first step:
- sec. 3.3.10.1 (Japanese only) changed sentence
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index f47e52f..479d8ca 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -1,5 +1,5 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 510
+#LyX 2.2 created this file. For more info see http://www.lyx.org/
+\lyxformat 508
\begin_document
\begin_header
\save_transient_properties true
@@ -56,7 +56,6 @@ logicalmkup
\font_osf false
\font_sf_scale 100 100
\font_tt_scale 100 100
-\use_microtype false
\graphics default
\default_output_format pdf2
\output_sync 0
@@ -118,12 +117,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 424524441 "rgheck"
\end_header
\begin_body
@@ -6765,16 +6763,7 @@ Format
Any format is acceptable, but one would normally use the format current
at the time.
(In \SpecialChar LyX
- 2.1, the current layout format is 48.) You should be aware that local
- layout is not supported by versions of \SpecialChar LyX
- prior to 1.6, so you should not
- use it if you want to be able to export your document to \SpecialChar LyX
- 1.5 or earlier
- (without, that is, losing the local layout information).
- If you wish to be able to export to 1.6—local layout is supported in 1.6,
- though there is no UI for it—then you should use format 11 and, of course,
- use only layout constructs that were available in \SpecialChar LyX
- 1.6.
+ 2.2, the current layout format is 60.)
\end_layout
\begin_layout Standard
@@ -6941,8 +6930,7 @@ myclass.layout
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class{report}
+DeclareLaTeXClass{report}
\end_layout
\begin_layout Standard
@@ -6952,8 +6940,7 @@ to read
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class[report, myclass.sty]{report (myclass)}
+DeclareLaTeXClass[report, myclass.sty]{report (myclass)}
\end_layout
\begin_layout Standard
@@ -7146,7 +7133,7 @@ DeclareLyXModule{My Package}
\end_layout
\begin_layout LyX-Code
-Format 35
+Format 60
\begin_inset Newline newline
\end_inset
@@ -7280,8 +7267,7 @@ thesis.layout
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class[thesis,book]{thesis}
+DeclareLaTeXClass[thesis,book]{thesis}
\end_layout
\begin_layout Standard
@@ -8435,7 +8421,7 @@ Format
.
The format for the present version of \SpecialChar LyX
- is format 59.
+ is format 60.
But each version of \SpecialChar LyX
is capable of reading earlier versions' layout files,
just as they are capable of reading files produced by earlier versions
@@ -18487,7 +18473,7 @@ end
status collapsed
\begin_layout Plain Layout
-LyXType
+LyxType
\end_layout
\end_inset
@@ -18512,23 +18498,17 @@ MultiPar
\end_inset
- to false
-\change_inserted 424524441 1466537871
- and
+ to false and
\begin_inset Flex Code
-status open
+status collapsed
\begin_layout Plain Layout
-
-\change_inserted 424524441 1466537871
ForcePlain
\end_layout
\end_inset
- to true
-\change_unchanged
-.
+ to true.
\begin_inset Flex Code
status collapsed
@@ -18539,23 +18519,17 @@ MultiPar
\end_inset
- can be set to true
-\change_inserted 424524441 1466537883
-, or
+ can be set to true, or
\begin_inset Flex Code
-status open
+status collapsed
\begin_layout Plain Layout
-
-\change_inserted 424524441 1466537883
ForcePlain
\end_layout
\end_inset
- to false,
-\change_unchanged
- for
+ to false, for
\begin_inset Flex Code
status collapsed
@@ -18574,13 +18548,12 @@ after
status collapsed
\begin_layout Plain Layout
-LyXType
+LyxType
\end_layout
\end_inset
.
-
\end_layout
\begin_layout Description
diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 7e65db6..0f2ece6 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -213,7 +213,6 @@
\html_math_output 0
\html_css_as_file 0
\html_be_strict false
-\author 5863208 "ab"
\end_header
\begin_body
@@ -34200,31 +34199,32 @@ Maxima
\end_layout
\begin_layout Itemize
-
-\change_inserted 5863208 1465782906
\begin_inset Formula
$\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$
\end_inset
-\begin_inset Foot
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
status open
\begin_layout Plain Layout
-\change_inserted 5863208 1465782906
-Note that one needs to use proper delimiter insets
+\series bold
+Note:
+\series default
+ One needs to use proper delimiter insets
\begin_inset Formula $\left(\right)$
\end_inset
instead of simple '(' ')' characters.
-
\end_layout
\end_inset
-
-\change_unchanged
-
+
\end_layout
\begin_layout Itemize
@@ -34245,30 +34245,18 @@ Note that one needs to use proper delimiter insets
\end_layout
-\begin_layout Standard
-
-\change_inserted 5863208 1465782942
-One can also use standard commands known to CAS:
-\end_layout
-
\begin_layout Itemize
-
-\change_inserted 5863208 1465782942
-\begin_inset Formula
$powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit
i_{2}}=0}^{\infty}{\frac{4^{-{\mathit i_{2}}-1}\,\left(x-1\right)^{{\mathit
i_{2}}+1}}{{\mathit i_{2}}+1}}-\log4$
+\begin_inset Formula
$powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$
\end_inset
\end_layout
\begin_layout Itemize
-
-\change_inserted 5863208 1465782942
\begin_inset Formula
$solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$
\end_inset
-\change_unchanged
-
\end_layout
\begin_layout Subsection
@@ -35173,6 +35161,13 @@ As one can see, the distance of the numerator and the
denominator to the
fraction bar is round about three times the bar thickness.
\end_layout
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsection
Canceled Formulas
\begin_inset Index idx
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 6c1da0d..23b126b 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -134,12 +134,11 @@ enumitem
\papercolumns 1
\papersides 2
\paperpagestyle default
-\tracking_changes true
+\tracking_changes false
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict true
-\author 986154928 "Gnter Milde"
\end_header
\begin_body
@@ -8311,12 +8310,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
@@ -8329,6 +8330,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
+
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -8352,6 +8354,7 @@ Verbatim
\end_layout
\begin_layout Verbatim*
+
This is Verbatim*.
\end_layout
@@ -16979,42 +16982,6 @@ open close
"
\family default
, generates this automatically.
-\change_inserted 986154928 1464030688
-
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-
-\change_inserted 986154928 1464016381
-You can, of course, remove this
-\begin_inset Quotes eld
-\end_inset
-
-smart quotes
-\begin_inset Quotes erd
-\end_inset
-
- keybinding if you prefer.
- See section
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "subsec:Editing-Shortcuts"
-
-\end_inset
-
-.
-\end_layout
-
-\end_inset
-
-
-\change_unchanged
-
\end_layout
\begin_layout Standard
@@ -17186,23 +17153,7 @@ this
\end_layout
\begin_layout Standard
-For
-\change_inserted 986154928 1464016392
-
-\begin_inset Quotes eld
-\end_inset
-
-smart
-\begin_inset Quotes erd
-\end_inset
-
-
-\change_unchanged
-single quotes
-\change_deleted 986154928 1464016400
-you have to
-\change_unchanged
-use the shortcut
+For single quotes you have to use the shortcut
\begin_inset Info
type "shortcut"
arg "quote-insert single"
@@ -31058,7 +31009,11 @@ Modules
\begin_inset Quotes eld
\end_inset
+
+\emph on
Custom Header/Footerlines
+\emph default
+
\begin_inset Quotes erd
\end_inset
@@ -31067,7 +31022,7 @@ Custom Header/Footerlines
\begin_inset space ~
\end_inset
-styles:
+environments:
\end_layout
\begin_layout Description
@@ -31120,6 +31075,7 @@ Footer
\begin_layout Standard
for the different positions in the header/footer.
+ These environments can be selected in the environment pull-down box.
\end_layout
\begin_layout Standard
@@ -31367,12 +31323,13 @@ Definition
\end_layout
\begin_layout Standard
-To define your header line, add all three header styles.
- The things you add to the styles appear on odd numbered pages, the things
- in the optional arguments on even numbered pages.
+To define your header line, add all three header environments.
+ The things you add to each environment appear on odd numbered pages, the
+ things in the optional arguments on even numbered pages.
For single-sided documents, the optional arguments will not be used and
can be omitted.
- If you leave a style or its argument empty, nothing appears in the output.
+ If you leave a header environment or its argument empty, nothing appears
+ in the output.
Defining the footer line works similarly.
\end_layout
@@ -31464,8 +31421,8 @@ Appearance
\begin_layout Standard
The header and footer will appear on normal pages.
Some pages are different.
- The title page has a style of its own, and so does any page that starts
- a new part or chapter in your book.
+ The title page has a header/footer environment of its own, and so does
+ any page that starts a new part or chapter in your book.
Such pages will not have the custom headers/footers, but that is normal.
There is for example no need to print a header with the chapter name on
the chapter page where the chapter heading is in big bold letters anyway.
@@ -31509,12 +31466,16 @@ headrulewidth}{thickness}
\begin_layout Standard
where thickness is a size in standard units like
\family sans
+\emph on
pt
\family default
+\emph default
or
\family sans
+\emph on
mm
\family default
+\emph default
.
If you don't want a line, set the thickness to 0
\begin_inset space \thinspace{}
@@ -31546,7 +31507,7 @@ Several header/footer lines
\begin_layout Standard
In case you need more than one text line as a header/footer, you can do
- this by adding a normal line break in the style definition.
+ this by adding a ragged line break in the style definition.
However, the default height of the header/footer is only the one of one
text line.
To expand the height, redefine the \SpecialChar LaTeX
@@ -31562,7 +31523,7 @@ headheight
\backslash
footheight
\series default
- in this entry in
+ with this entry in
\family sans
Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator
@@ -31586,14 +31547,34 @@ headheight}{height}
\end_layout
\begin_layout Standard
-where height is a size in standard units.
- If you don't know which amount of space is needed for the height, define
- your header/footer and preview your document as a PDF.
+where
+\series bold
+height
+\series default
+ is a size in standard units (e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space \space{}
+\end_inset
+
+
+\series bold
+1cm
+\series default
+).
+ If you don't know how much space is needed for the height, define your
+ header/footer and preview your document as a PDF.
Then open the \SpecialChar LaTeX
logfile with the menu
\family sans
Document\SpecialChar menuseparator
-LaTeX Log
+LaTeX
+\begin_inset space ~
+\end_inset
+
+Log
\family default
and use the button
\family sans
diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 889e77f..b815cb3 100644
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -1,5 +1,5 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 510
+#LyX 2.2 created this file. For more info see http://www.lyx.org/
+\lyxformat 508
\begin_document
\begin_header
\save_transient_properties true
@@ -58,7 +58,6 @@ logicalmkup
\font_osf false
\font_sf_scale 100 100
\font_tt_scale 100 100
-\use_microtype false
\graphics default
\default_output_format pdf2
\output_sync 0
@@ -4858,16 +4857,7 @@ Format
Any format is acceptable, but one would normally use the format current
at the time.
(In \SpecialChar LyX
- 2.1, the current layout format is 48.) You should be aware that local
- layout is not supported by versions of \SpecialChar LyX
- prior to 1.6, so you should not
- use it if you want to be able to export your document to \SpecialChar LyX
- 1.5 or earlier
- (without, that is, losing the local layout information).
- If you wish to be able to export to 1.6—local layout is supported in 1.6,
- though there is no UI for it—then you should use format 11 and, of course,
- use only layout constructs that were available in \SpecialChar LyX
- 1.6.
+ 2.2, the current layout format is 60.)
\end_layout
\begin_layout Standard
@@ -5062,8 +5052,7 @@ myclass.layout
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class{report}
+DeclareLaTeXClass{report}
\end_layout
\begin_layout Standard
@@ -5075,8 +5064,7 @@ to read
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class[report, myclass.sty]{report (myclass)}
+DeclareLaTeXClass[report, myclass.sty]{report (myclass)}
\end_layout
\begin_layout Standard
@@ -5297,7 +5285,7 @@ DeclareLyXModule{My Package}
\end_layout
\begin_layout LyX-Code
-Format 35
+Format 60
\begin_inset Newline newline
\end_inset
@@ -5449,8 +5437,7 @@ thesis.layout
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class[thesis,book]{thesis}
+DeclareLaTeXClass[thesis,book]{thesis}
\end_layout
\begin_layout Standard
@@ -6520,7 +6507,7 @@ Format
behandelt.
Das Format dieser \SpecialChar LyX
--Version ist 59.
+-Version ist 60.
Aber jede \SpecialChar LyX
-Version kann ältere Versionen von Layout-Dateien lesen, so wie
es ältere \SpecialChar LyX
@@ -16903,11 +16890,7 @@ end
status collapsed
\begin_layout Plain Layout
-
-\family sans
-LyX
-\family default
-Type
+LyxType
\end_layout
\end_inset
@@ -16942,6 +16925,26 @@ status collapsed
\end_inset
+ und
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+ automatisch auf
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+
gesetzt.
\begin_inset Flex Code
@@ -16963,6 +16966,26 @@ status collapsed
\end_inset
+ oder
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+ auf
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+0
+\end_layout
+
+\end_inset
+
für
\begin_inset Flex Code
status collapsed
@@ -16982,11 +17005,7 @@ nach
status collapsed
\begin_layout Plain Layout
-
-\family sans
-LyX
-\family default
-Type
+LyxType
\end_layout
\end_inset
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index c9eb28e..ccd8e31 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -34089,6 +34089,35 @@ Maxima
\end_layout
\begin_layout Itemize
+\begin_inset Formula
$\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Achtung:
+\series default
+ Es muss die Einfügung für automatische Klammern
+\begin_inset Formula $\left(\right)$
+\end_inset
+
+ verwendet werden statt einfacher zeichen für Klammern '(' ')'.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
\begin_inset Formula $\det\left[\begin{array}{ccc}
1 & 6 & 7\\
2 & 5 & 8\\
@@ -34106,6 +34135,20 @@ Maxima
\end_layout
+\begin_layout Itemize
+\begin_inset Formula
$powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula
$solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsection
Tastenkürzel
\end_layout
@@ -34997,6 +35040,13 @@ Wie man sieht, entspricht der Abstand des Zählers und
Nenners vom Strich
in etwa der dreifachen Strichdicke.
\end_layout
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsection
Durchgestrichene Formeln
\begin_inset Index idx
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index b6ad99a..3634cf1 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -1,5 +1,5 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 510
+#LyX 2.2 created this file. For more info see http://www.lyx.org/
+\lyxformat 508
\begin_document
\begin_header
\save_transient_properties true
@@ -55,7 +55,6 @@ logicalmkup
\font_osf false
\font_sf_scale 100 100
\font_tt_scale 100 100
-\use_microtype false
\graphics default
\default_output_format pdf2
\output_sync 0
@@ -6380,16 +6379,7 @@ Format
Cualquier formato es aceptable, pero debería usarse normalmente el actual
formato.
(En \SpecialChar LyX
- 2.1 el formato actual es 48).
- Debes tener en cuenta que el formato local no es soportado por versiones
- de \SpecialChar LyX
- anteriores a 1.6, por tanto no deberías usarlo si quieres poder exportar
- el documento a \SpecialChar LyX
- 1.5 o anteriores sin perder la información del formato local.
- Si quieres poder exportar a 1.6 —el formato local es soportado pero no hay
- IU par él—, deberías usar formato 11 y, por supuesto, usar solo estructuras
- que estuvieran disponibles en \SpecialChar LyX
- 1.6.
+ 2.2 el formato actual es 60).
\end_layout
\begin_layout Standard
@@ -6554,8 +6544,7 @@ myclass.layout
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class{report}
+DeclareLaTeXClass{report}
\end_layout
\begin_layout Standard
@@ -6565,8 +6554,7 @@ por la línea
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class[report, myclass.sty]{report (myclass)}
+DeclareLaTeXClass[report, myclass.sty]{report (myclass)}
\end_layout
\begin_layout Standard
@@ -6752,8 +6740,7 @@ myclass.sty
\begin_layout LyX-Code
#
\backslash
-Declare\SpecialChar LyX
-Module{My Package}
+DeclareLyXModule{My Package}
\end_layout
\begin_layout LyX-Code
@@ -6773,7 +6760,7 @@ Module{My Package}
\end_layout
\begin_layout LyX-Code
-Format 35
+Format 60
\begin_inset Newline newline
\end_inset
@@ -6883,8 +6870,7 @@ thesis.layout
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class[thesis,book]{thesis}
+DeclareLaTeXClass[thesis,book]{thesis}
\end_layout
\begin_layout Standard
@@ -7302,22 +7288,7 @@ del T.
\size small
#
\backslash
-DeclareLaT
-\size default
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size small
-eXClass{Article (Standard Class)}
+DeclareLaTeXClass{Article (Standard Class)}
\end_layout
\begin_layout LyX-Code
@@ -7526,22 +7497,7 @@ myarticle.layout
\size small
#
\backslash
-DeclareLaT
-\size default
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size small
-eXClass[article]{Article (con Mis Encabezados)}
+DeclareLaTeXClass[article]{Article (con Mis Encabezados)}
\end_layout
\begin_layout LyX-Code
@@ -7597,22 +7553,7 @@ Article (con Mis Encabezados)
\size small
#
\backslash
-DeclareLaT
-\size default
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size small
-eXClass[article,foo.sty]{Article (con Mis Encabezados)}
+DeclareLaTeXClass[article,foo.sty]{Article (con Mis Encabezados)}
\end_layout
\begin_layout LyX-Code
@@ -7666,22 +7607,7 @@ Así, para ser lo más explícito posible, la forma de la
declaración del forma
\size small
#
\backslash
-DeclareLaT
-\size default
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size small
-eXClass[class,package.sty]{descripción del formato}
+DeclareLaTeXClass[class,package.sty]{descripción del formato}
\end_layout
\begin_layout LyX-Code
@@ -7852,18 +7778,7 @@ Un módulo debe empezar con una línea como la siguiente:
\begin_layout LyX-Code
#
\backslash
-DeclareL
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-yXModule[endnotes.sty]{Endnotes}
+DeclareLyXModule[endnotes.sty]{Endnotes}
\end_layout
\begin_layout Standard
@@ -8112,7 +8027,7 @@ Format
.
El número para la versión actual de \SpecialChar LyX
- es formato 59.
+ es formato 60.
Cada versión de \SpecialChar LyX
es capaz de leer los formatos de versiones anteriores,
de la misma forma que puede leer archivos producidos con versiones de
\SpecialChar LyX
@@ -18071,7 +17986,7 @@ Command, Environment, None
] Cómo debería traducirse el estilo en \SpecialChar LaTeX
.
\begin_inset Foot
-status open
+status collapsed
\begin_layout Plain Layout
\begin_inset Flex Code
@@ -18304,8 +18219,7 @@ end
status collapsed
\begin_layout Plain Layout
-\SpecialChar LyX
-Type
+LyxType
\end_layout
\end_inset
@@ -18330,7 +18244,21 @@ MultiPar
\end_inset
- es falso.
+ es falso y
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+
+\lang english
+to true
+\lang spanish
+.
\begin_inset Flex Code
status collapsed
@@ -18341,7 +18269,21 @@ MultiPar
\end_inset
- se puede poner como verdadero para recuadros de estilos
+ se puede poner como verdadero, o
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+
+\lang english
+to fals
+\lang spanish
+e, para recuadros de estilos
\begin_inset Flex Code
status collapsed
@@ -18360,8 +18302,7 @@ después
status collapsed
\begin_layout Plain Layout
-\SpecialChar LyX
-Type
+LyxType
\end_layout
\end_inset
diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index 7e77dbd..282b378 100644
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -34686,6 +34686,38 @@ Maxima
\end_layout
\begin_layout Itemize
+\begin_inset Formula
$\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ One needs to use proper delimiter insets
+\begin_inset Formula $\left(\right)$
+\end_inset
+
+ instead of simple '(' ')' characters.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
\begin_inset Formula $\det\left[\begin{array}{ccc}
1 & 6 & 7\\
2 & 5 & 8\\
@@ -34703,6 +34735,20 @@ Maxima
\end_layout
+\begin_layout Itemize
+\begin_inset Formula
$powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula
$solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsection
Atajos de teclado
\end_layout
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 6a6c27f..20a9e83 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8613,12 +8613,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
@@ -8631,6 +8633,7 @@ Las dos líneas siguientes están vacías:
\end_layout
\begin_layout Verbatim
+
Casi todo está permitido en entorno Literal:"%&$§#~'`
\backslash
}][{|
@@ -8655,6 +8658,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
@@ -31780,7 +31784,7 @@ Módulos
\begin_inset space ~
\end_inset
-estilos:
+etornos:
\end_layout
\begin_layout Description
@@ -31833,6 +31837,9 @@ derecha
\begin_layout Standard
para las diferentes posiciones en el encabezado y en el pie de página.
+
+\lang english
+These environments can be selected in the environment pull-down box.
\end_layout
\begin_layout Standard
@@ -32329,7 +32336,11 @@ headheight}{altura}
\end_layout
\begin_layout Standard
-Altura es una longitud en unidades estándar.
+Altura es una longitud en unidades estándar (por ejemplo
+\series bold
+1cm
+\series default
+).
Si desconoces la cantidad de espacio necesaria, define tu encabezado o
pie y haz una vista previa PDF del documento.
Luego abres el
diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx
index 93eb7f3..b9c8f86 100644
--- a/lib/doc/fr/Customization.lyx
+++ b/lib/doc/fr/Customization.lyx
@@ -1,5 +1,5 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 510
+#LyX 2.2 created this file. For more info see http://www.lyx.org/
+\lyxformat 508
\begin_document
\begin_header
\save_transient_properties true
@@ -55,7 +55,6 @@ logicalmkup
\font_osf false
\font_sf_scale 100 100
\font_tt_scale 100 100
-\use_microtype false
\graphics default
\default_output_format pdf2
\output_sync 0
@@ -6421,8 +6420,7 @@ format local
Vous le trouverez via
\family sans
Document\SpecialChar menuseparator
-Paramètres\SpecialChar ldots
-\SpecialChar menuseparator
+Paramètres\SpecialChar menuseparator
Format local
\family default
.
@@ -6444,18 +6442,7 @@ Format
N'importe quel format est admissible, mais on utilise d'habitude le format
de la version de \SpecialChar LyX
utilisée (pour \SpecialChar LyX
- 2.1, le format porte le numéro 48).
- Vous devez savoir que le format local n'existe pas pour les versions de
- \SpecialChar LyX
- antérieures à 1.6, vous ne devez donc pas l'utiliser si vous envisagez
- d'exporter votre document en version 1.5 ou antérieure (en fait, sans perdre
- l'information de format local).
- Si vous souhaitez exporter vers \SpecialChar LyX
- version 1.6 — le format local est reconnu,
- mais il n'y a pas d'interface pour y accéder — vous devez alors utiliser
- le format 11 et bien entendu vous restreindre aux constructions de format
- qui étaient disponibles avec \SpecialChar LyX
- 1.6.
+ 2.2, le format porte le numéro 60).
\end_layout
\begin_layout Standard
@@ -6599,8 +6586,7 @@ ma_classe.layout
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class{report}
+DeclareLaTeXClass{report}
\end_layout
\begin_layout Standard
@@ -6610,8 +6596,7 @@ en :
\begin_layout LyX-Code
\backslash
-Declare\SpecialChar LaTeX
-Class[report, ma_classe.sty]{report (ma_classe)}
+DeclareLaTeXClass[report, ma_classe.sty]{report (ma_classe)}
\end_layout
\begin_layout Standard
@@ -6680,8 +6665,7 @@ status collapsed
\begin_layout Plain Layout
Document\SpecialChar menuseparator
-Paramètres\SpecialChar ldots
-\SpecialChar menuseparator
+Paramètres\SpecialChar menuseparator
Classe de document
\end_layout
@@ -6826,8 +6810,7 @@ ma_classe.sty
\lang english
#
\backslash
-Declare\SpecialChar LyX
-Module{mon paquetage}
+DeclareLyXModule{mon paquetage}
\end_layout
\begin_layout LyX-Code
@@ -6855,7 +6838,7 @@ Module{mon paquetage}
\begin_layout LyX-Code
\lang english
-Format 35
+Format 60
\begin_inset Newline newline
\end_inset
@@ -7000,8 +6983,7 @@ thesis.layout
\lang english
\backslash
-Declare\SpecialChar LaTeX
-Class[thesis,book]{thesis}
+DeclareLaTeXClass[thesis,book]{thesis}
\end_layout
\begin_layout Standard
@@ -7408,18 +7390,7 @@ Ne pas effacer la ligne ci-dessous ; configure compte
dessus.
\size small
#
\backslash
-DeclareLaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eXClass{Article (Standard Class)}
+DeclareLaTeXClass{Article (Standard Class)}
\end_layout
\begin_layout LyX-Code
@@ -7638,18 +7609,7 @@ mon_article.layout
\size small
#
\backslash
-DeclareLaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eXClass[article]{Article (avec Mes En-têtes)}
+DeclareLaTeXClass[article]{Article (avec Mes En-têtes)}
\end_layout
\begin_layout LyX-Code
@@ -7706,18 +7666,7 @@ Article (avec Mes En-têtes)
\size small
#
\backslash
-DeclareLaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eXClass[article,machin.sty]{Article (avec Mes En-têtes)}
+DeclareLaTeXClass[article,machin.sty]{Article (avec Mes En-têtes)}
\end_layout
\begin_layout LyX-Code
@@ -7781,18 +7730,7 @@ Donc, de la manière la plus explicite, la forme d'une
déclaration de format
\size small
#
\backslash
-DeclareLaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eXClass[class,package.sty]{description du format}
+DeclareLaTeXClass[class,package.sty]{description du format}
\end_layout
\begin_layout LyX-Code
@@ -7984,22 +7922,7 @@ La première ligne d'un module doit être rédigée comme
suit:
\begin_layout LyX-Code
#
\backslash
-DeclareL
-\size small
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size default
-yXModule[endnotes.sty]{Endnotes}
+DeclareLyXModule[endnotes.sty]{Endnotes}
\end_layout
\begin_layout Standard
@@ -8275,7 +8198,7 @@ Format
\lang french
.
- Le numéro de format du présent fichier est le numéro 59.
+ Le numéro de format du présent fichier est le numéro 60.
mais chaque version de \SpecialChar LyX
peut lire les fichiers de format d'une version
plus ancienne, comme elle peut lire les documents crées avec une version
@@ -20140,8 +20063,7 @@ s, etc).
status collapsed
\begin_layout Plain Layout
-\SpecialChar LyX
-Type
+LyxType
\end_layout
\end_inset
@@ -20166,7 +20088,21 @@ MultiPar
\end_inset
- à faux.
+ à faux et
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+
+\lang english
+to true
+\lang french
+.
\begin_inset Flex Code
status collapsed
@@ -20177,7 +20113,21 @@ MultiPar
\end_inset
- peut être positionné à vrai pour les inserts
+ peut être positionné à vrai ou
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+
+\lang english
+to false
+\lang french
+, pour les inserts
\begin_inset Flex Code
status collapsed
@@ -20196,8 +20146,7 @@ après
status collapsed
\begin_layout Plain Layout
-\SpecialChar LyX
-Type
+LyxType
\end_layout
\end_inset
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index c6abc05..8be3969 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -34728,6 +34728,38 @@ Maxima
\end_layout
\begin_layout Itemize
+\begin_inset Formula
$\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ One needs to use proper delimiter insets
+\begin_inset Formula $\left(\right)$
+\end_inset
+
+ instead of simple '(' ')' characters.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
\begin_inset Formula $\det\left[\begin{array}{ccc}
1 & 6 & 7\\
2 & 5 & 8\\
@@ -34745,6 +34777,20 @@ Maxima
\end_layout
+\begin_layout Itemize
+\begin_inset Formula
$powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula
$solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsection
Raccourci clavier
\end_layout
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 0e3acc8..e6c66a0 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -9138,12 +9138,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
@@ -9156,6 +9158,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
+
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -9188,6 +9191,7 @@ Verbatim
\end_layout
\begin_layout Verbatim*
+
This is Verbatim*.
\end_layout
@@ -33082,7 +33086,7 @@ Personnalisation en-têtes/pieds de page
\begin_inset space ~
\end_inset
-styles suivants:
+environnements suivants:
\end_layout
\begin_layout Description
@@ -33135,6 +33139,9 @@ droit
\begin_layout Standard
pour paramétrer les différentes positions dans l'en-tête et le pied.
+
+\lang english
+These environments can be selected in the environment pull-down box.
\end_layout
\begin_layout Standard
@@ -33543,15 +33550,11 @@ où
\begin_inset Quotes frd
\end_inset
- est une taille en unités standard comme
-\family sans
-pt
-\family default
- ou
-\family sans
-mm
-\family default
-.
+ est une taille en unités standard (pour example
+\series bold
+1cm
+\series default
+).
Si vous ne voulez pas de ligne, positionnez l'épaisseur à 0
\begin_inset space ~
\end_inset
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 0b4e0c6..573ce19 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -1,5 +1,5 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 510
+#LyX 2.2 created this file. For more info see http://www.lyx.org/
+\lyxformat 508
\begin_document
\begin_header
\save_transient_properties true
@@ -99,7 +99,6 @@ End
\font_osf false
\font_sf_scale 100 100
\font_tt_scale 100 100
-\use_microtype false
\graphics default
\default_output_format pdf3
\output_sync 0
@@ -5965,13 +5964,7 @@ Format
\end_inset
タグは挿入しなくてはなりません．どの書式を使用しても構いませんが，通常は，執筆時点の最新書式を用いることになるでしょう(\SpecialChar LyX
- 2.1では，最新書式は48です)．また，
-ローカルレイアウトは，\SpecialChar LyX
- 1.6より前の版ではサポートされていないことを認識しておく必要があります．したがって，文書を\SpecialChar LyX
- 1.5またはそれ以前の版に(ローカルレイアウト
-情報を失うことなく)書き出せることを望むならば，使用するべきではありません．第1.6版へ—第1.6版はUIはありませんがローカルレイアウトをサポートしています—書き
-出せることを望むならば，書式11を用いて，さらに\SpecialChar LyX
- 1.6で使用できるレイアウト要素のみを使用してください．
+ 2.2では，最新書式は60です)
\end_layout
\begin_layout Standard
@@ -6294,7 +6287,7 @@ DeclareLyXModule{My Package}
\end_layout
\begin_layout LyX-Code
-Format 35
+Format 60
\begin_inset Newline newline
\end_inset
@@ -6429,18 +6422,7 @@ thesis.layout
\begin_layout LyX-Code
\backslash
-DeclareLaT
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-eXClass[thesis,book]{thesis}
+DeclareLaTeXClass[thesis,book]{thesis}
\end_layout
\begin_layout Standard
@@ -6968,22 +6950,7 @@ myarticle
\size small
#
\backslash
-DeclareLaT
-\size default
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-
-\size small
-eXClass[article,foo.sty]{Article (with My Own Headings)}
+DeclareLaTeXClass[article,foo.sty]{Article (with My Own Headings)}
\end_layout
\begin_layout LyX-Code
@@ -7190,18 +7157,7 @@ status collapsed
\begin_layout LyX-Code
#
\backslash
-DeclareL
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{}
-\end_layout
-
-\end_inset
-
-yXModule[endnotes.sty]{Endnotes}
+DeclareLyXModule[endnotes.sty]{Endnotes}
\end_layout
\begin_layout Standard
@@ -7440,7 +7396,7 @@ status collapsed
\end_inset
1.3.x以前のレイアウトファイルには，明示されたファイル形式がないため，書式1と解されます．\SpecialChar LyX
-現行版のファイル形式は，書式59です．しかし，\SpecialChar LyX
+現行版のファイル形式は，書式60です．しかし，\SpecialChar LyX
の各版は，旧版の\SpecialChar LyX
で作成さ
れたファイルを読むことができるように，旧版のレイアウトファイルも読むことができます．しかしながら，以前の書式に変換する方法はありません．
@@ -16424,7 +16380,7 @@ end
status collapsed
\begin_layout Plain Layout
-LyXType
+LyxType
\end_layout
\end_inset
@@ -16449,7 +16405,25 @@ MultiPar
\end_inset
-が偽に設定されます．文字様式差込枠で
+が偽に設定されます
+\lang english
+ and
+\lang japanese
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+
+\lang english
+ to true
+\lang japanese
+．文字様式差込枠で
\begin_inset Flex Code
status collapsed
@@ -16459,12 +16433,30 @@ MultiPar
\end_inset
-を真にしたい時には，
+を真にしたい時には
+\lang english
+, or
+\lang japanese
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForcePlain
+\end_layout
+
+\end_inset
+
+
+\lang english
+ to false
+\lang japanese
+，
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-LyXType
+LyxType
\end_layout
\end_inset
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index d6c900b..03c6243 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -33431,6 +33431,38 @@ Maxima
\end_layout
\begin_layout Itemize
+\begin_inset Formula
$\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\lang english
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ One needs to use proper delimiter insets
+\begin_inset Formula $\left(\right)$
+\end_inset
+
+ instead of simple '(' ')' characters.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
\begin_inset Formula $\det\left[\begin{array}{ccc}
1 & 6 & 7\\
2 & 5 & 8\\
@@ -33448,6 +33480,20 @@ Maxima
\end_layout
+\begin_layout Itemize
+\begin_inset Formula
$powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+\begin_inset Formula
$solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsection
捷径
\end_layout
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 4d16697..ce5e441 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -7228,12 +7228,14 @@ Space
\end_layout
\begin_layout Verbatim
+
これは原文儘(verbatim)環境です．
\end_layout
\begin_layout Verbatim
\noindent
\align block
+
この下の2行は空白行です．
\end_layout
@@ -7246,6 +7248,7 @@ Space
\end_layout
\begin_layout Verbatim
+
右記の各文字を始め，ほぼすべての文字が使えます．例："%&$§#~'`
\backslash
}][{|
@@ -7268,6 +7271,7 @@ Space
\end_layout
\begin_layout Verbatim*
+
This is Verbatim*.
\end_layout
@@ -26693,7 +26697,13 @@ status collapsed
\end_layout
\begin_layout Standard
-通常，ヘッダとフッタは文頭で設定しますが，お望みならば，どこででも変更することができます．図
+通常，ヘッダとフッタは文頭で設定しますが，お望みならば，どこででも変更することができます．
+\lang english
+These environments can be selected in the environment pull-down box.
+\end_layout
+
+\begin_layout Standard
+図
\begin_inset CommandInset ref
LatexCommand ref
reference "fig:ページレイアウト"
@@ -27080,8 +27090,24 @@ headheight
\backslash
footheight
\series default
-を再定義してください．ここで「高さ」は，標準単位での高さです．どのくらいの高さが必要かがわからない場合には，とりあえずヘッダやフッタを定義して，PDFで文書をプ
-レビューしてみてください．それから，
+を再定義してください
+\lang english
+(e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space \space{}
+\end_inset
+
+
+\series bold
+1cm
+\series default
+)
+\lang japanese
+．ここで「高さ」は，標準単位での高さです．どのくらいの高さが必要かがわからない場合には，とりあえずヘッダやフッタを定義して，PDFで文書をプレビューしてみてくだ
+さい．それから，
\family sans
文書\SpecialChar menuseparator
LaTeXログ
