UserGuide: - update from floatflt to wrapfig

 - mention the math manual

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23498 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 631e4ac483d786bf4371488c1e6d86b029760905..30b290afb2f452dd16e125316bac4ba068388b68 100644 (file)
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -1,4 +1,4 @@
-#LyX 1.5.4svn created this file. For more info see http://www.lyx.org/
+#LyX 1.5.5svn created this file. For more info see http://www.lyx.org/
 \lyxformat 276
 \begin_document
 \begin_header
@@ -142,31 +142,13 @@ del t
 
 
 \newline
-
-\newline
-Versión 1.5.4
+Versión 1.5.5
 \end_layout
 
 \begin_layout Standard
 \begin_inset Note Note
 status open
 
-\begin_layout Standard
-Para exportar este documento a PDF, Postscript, o DVI, debe estar instalado
- el paquete LaTeX 
-\series bold
-hyperref
-\series default
-.
- Este paquete se incluye en todas las distribuciones habituales de LaTeX.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Note Note
-status collapsed
-
 \begin_layout Standard
 
 \emph on
@@ -18396,11 +18378,11 @@ texto
 \family default
  si está instalado el paquete LaTeX 
 \series bold
-floatflt
+wrapfig
 \series default
 
 \begin_inset LatexCommand index
-name "LaTeX-paquetes ! floatflt"
+name "LaTeX-paquetes ! wrapfig"
 
 \end_inset
 
@@ -18452,18 +18434,18 @@ reference "cha:Unidades-disponibles"
 \begin_layout Standard
 El paquete LaTeX 
 \series bold
-floatflt
+wrapfig
 \series default
  también soporta tablas ajustadas a texto, pero aún no es soportado por
  LyX.
  Si necesitas utilizarlo, consulta la documentación de 
 \series bold
-floatflt
+wrapfig
 \series default
 \InsetSpace ~
 
 \begin_inset LatexCommand cite
-key "floatflt"
+key "wrapfig"
 
 \end_inset
 
@@ -18492,30 +18474,6 @@ e.
  si una figura está muy cerca de la parte inferior de la página puede haber
  errores en la salida, como que el flotante no aparezca o se coloque junto
  a un texto distinto.
-\begin_inset Foot
-status open
-
-\begin_layout Standard
-La mejor solución es usar el paquete LaTeX 
-\series bold
-wrapfig
-\series default
-
-\begin_inset LatexCommand index
-name "LaTeX-paquetes ! wrapfig"
-
-\end_inset
-
- en vez de 
-\series bold
-floatflt
-\series default
- pero actualmente no es soportado por LyX.
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \end_inset
@@ -19087,6 +19045,16 @@ name "cha:Ecuaciones-matemáticas"
 
 \end_layout
 
+\begin_layout Standard
+Los temas tratados en este capítulo se desarrollan en profundidad en el
+ manual 
+\emph on
+Math.
+ 
+\emph default
+En él encontrarás también consejos y trucos para casos especiales.
+\end_layout
+
 \begin_layout Section
 Edición básica de ecuaciones
 \begin_inset LatexCommand index
@@ -38464,7 +38432,7 @@ target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/fancyhdr/fancyhd
 
 \begin_layout Bibliography
 \begin_inset LatexCommand bibitem
-key "floatflt"
+key "nomencl"
 
 \end_inset
 
@@ -38476,8 +38444,7 @@ status collapsed
 
 
 \backslash
-href{ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/floatflt/floatflt.pdf}
-{
+href{ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/nomencl/nomencl.pdf}{
 \end_layout
 
 \end_inset
@@ -38495,11 +38462,11 @@ status collapsed
 
  del paquete LaTeX 
 \series bold
-floatflt
+nomencl
 \series default
 
 \begin_inset LatexCommand index
-name "LaTeX-paquetes ! floatflt"
+name "LaTeX-paquetes ! nomencl"
 
 \end_inset
 
@@ -38507,7 +38474,7 @@ name "LaTeX-paquetes ! floatflt"
 \newline
 
 \begin_inset LatexCommand url
-target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/floatflt/floatflt.pdf"
+target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/nomencl/nomencl.pdf"
 
 \end_inset
 
@@ -38516,7 +38483,7 @@ target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/floatflt/floatfl
 
 \begin_layout Bibliography
 \begin_inset LatexCommand bibitem
-key "nomencl"
+key "tipa"
 
 \end_inset
 
@@ -38528,7 +38495,7 @@ status collapsed
 
 
 \backslash
-href{ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/nomencl/nomencl.pdf}{
+href{http://www.ctan.org/tex-archive/fonts/tipa/tipaman.pdf}{
 \end_layout
 
 \end_inset
@@ -38546,11 +38513,11 @@ status collapsed
 
  del paquete LaTeX 
 \series bold
-nomencl
+tipa
 \series default
 
 \begin_inset LatexCommand index
-name "LaTeX-paquetes ! nomencl"
+name "LaTeX-paquetes ! tipa"
 
 \end_inset
 
@@ -38558,7 +38525,7 @@ name "LaTeX-paquetes ! nomencl"
 \newline
 
 \begin_inset LatexCommand url
-target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/nomencl/nomencl.pdf"
+target "http://www.ctan.org/tex-archive/fonts/tipa/tipaman.pdf"
 
 \end_inset
 
@@ -38567,7 +38534,7 @@ target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/nomencl/nomencl.
 
 \begin_layout Bibliography
 \begin_inset LatexCommand bibitem
-key "tipa"
+key "wrapfig"
 
 \end_inset
 
@@ -38579,7 +38546,7 @@ status collapsed
 
 
 \backslash
-href{http://www.ctan.org/tex-archive/fonts/tipa/tipaman.pdf}{
+href{ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/wrapfig/wrapfig.sty}{
 \end_layout
 
 \end_inset
@@ -38597,11 +38564,11 @@ status collapsed
 
  del paquete LaTeX 
 \series bold
-tipa
+wrapfig
 \series default
 
 \begin_inset LatexCommand index
-name "LaTeX-paquetes ! tipa"
+name "LaTeX-paquetes ! wrapfig"
 
 \end_inset
 
@@ -38609,7 +38576,7 @@ name "LaTeX-paquetes ! tipa"
 \newline
 
 \begin_inset LatexCommand url
-target "http://www.ctan.org/tex-archive/fonts/tipa/tipaman.pdf"
+target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/wrapfig/wrapfig.sty"
 
 \end_inset
 
@@ -38823,6 +38790,47 @@ target "http://wiki.lyx.org/Windows/Hebrew"
 \end_inset
 
 
+\end_layout
+
+\begin_layout Bibliography
+\begin_inset LatexCommand bibitem
+key "Japanese"
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+href{http://wiki.lyx.org/Windows/Japanese}{
+\end_layout
+
+\end_inset
+
+Página Wiki
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+}
+\end_layout
+
+\end_inset
+
+ cómo configurar LyX para hebreo:
+\newline
+
+\begin_inset LatexCommand url
+target "http://wiki.lyx.org/Windows/Japanese"
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Bibliography

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 19615210f9c3c59191941e1cdcf14abdbcaf61a9..b8cbfe7e2457f54a7daf90cac4290c0d4f71e8fc 100644 (file)
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -1,4 +1,4 @@
-#LyX 1.5.4svn created this file. For more info see http://www.lyx.org/
+#LyX 1.5.5svn created this file. For more info see http://www.lyx.org/
 \lyxformat 276
 \begin_document
 \begin_header
@@ -167,29 +167,7 @@ eunier-Guttin-Cluzel
 
 
 \newline
-Version 1.5.3
-\end_layout
-
-\begin_layout Standard
-\begin_inset Note Note
-status open
-
-\begin_layout Standard
-Pour exporter ce document en PDF, ou en DVI, le paquetage LaTeX 
-\series bold
-hyperref
-\series default
- doit être installé.
- 
-\end_layout
-
-\begin_layout Standard
-Ce paquetage devrait faire partie de toutes les distributions LaTeX.
-\end_layout
-
-\end_inset
-
-
+Version 1.5.5
 \end_layout
 
 \begin_layout Standard
@@ -18100,11 +18078,11 @@ Ceci est une figure habillée et vous lisez la superbe légende qui la décrit.
 
 à la condition que le paquetage LaTeX 
 \series bold
-floatflt
+wrapfig
 \series default
 
 \begin_inset LatexCommand index
-name "Paquetages LaTeX! floatflt"
+name "Paquetages LaTeX! wrapfig"
 
 \end_inset
 
@@ -18132,10 +18110,7 @@ reference "cap:Figure-enrobée"
 
 \end_inset
 
- est un exemple de flottant d'enrobage avec une largeur de 40
-\begin_inset Formula $\,$
-\end_inset
-
+ est un exemple de flottant d'enrobage avec une largeur de 40\InsetSpace \thinspace{}
 col%.
 \begin_inset Foot
 status collapsed
@@ -18160,17 +18135,17 @@ reference "cha:Unités-de-longueur"
 \begin_layout Standard
 Le paquetage LaTeX 
 \series bold
-floatflt
+wrapfig
 \series default
  accepte aussi des flottants de tableau d'enrobage, mais ils ne sont pas
  encore gérés par LyX.
  Si vous en avez besoin, voyez la documentation de  
 \series bold
-floatflt
+wrapfig
 \series default
  
 \begin_inset LatexCommand cite
-key "floatflt"
+key "wrapfig"
 
 \end_inset
 
@@ -18191,26 +18166,6 @@ Note:
  n'apparaît pas à l'impression ou qu'il se retrouve par dessus une portion
  de texte
 \family sans
-
-\begin_inset Foot
-status collapsed
-
-\begin_layout Standard
-Le mieux serait d'utiliser la paquetage LaTeX 
-\series bold
-wrapfig
-\series default
-
-\begin_inset LatexCommand index
-name "Paquetages LaTeX ! wrapfig"
-
-\end_inset
-
- à la place de floatflt mais il n'est pas encore accepté par LyX.
-\end_layout
-
-\end_inset
-
 .
 \end_layout
 
@@ -18800,6 +18755,15 @@ name "Formules | see{Math}"
 
 \end_layout
 
+\begin_layout Standard
+Les sujets de ce chapitre sont traités en détail dans le manuel 
+\emph on
+Math.
+ 
+\emph default
+Vous y trouverez aussi des trucs et astuces pour les cas spéciaux.
+\end_layout
+
 \begin_layout Section
 Les Bases
 \begin_inset LatexCommand index
@@ -24022,6 +23986,24 @@ Commande
 \family sans
 d'index
 \family default
+, voyez la section\InsetSpace ~
+
+\begin_inset LatexCommand ref
+reference "sub:LaTeX-settings"
+
+\end_inset
+
+.
+ 
+\lang english
+The available options are listed and explained in
+\lang french
+ 
+\begin_inset LatexCommand cite
+key "makeindex"
+
+\end_inset
+
 .
  Vous pouvez aussi préciser un autre programme pour générer l'index, comme
  par exemple 
@@ -25447,6 +25429,30 @@ usepackage[labelfont=bf]{caption}
 
 \begin_layout Standard
 et votre problème est résolu.
+\lang english
+
+\begin_inset Foot
+status open
+
+\begin_layout Standard
+
+\lang english
+For more commands provided by the 
+\series bold
+caption
+\series default
+ package, have a look at its documentation, 
+\begin_inset LatexCommand cite
+key "caption"
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -34830,12 +34836,26 @@ status collapsed
 \end_inset
 
 eX
+\begin_inset LatexCommand label
+name "sub:LaTeX-settings"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+??
 \end_layout
 
 \begin_layout Subsection
 Répertoires
 \end_layout
 
+\begin_layout Standard
+??
+\end_layout
+
 \begin_layout Section
 Convertisseurs
 \end_layout
@@ -35700,7 +35720,7 @@ href{http://www.lyx.org/trac/browser/lyx-devel/trunk/lib/CREDITS}{
 
 \end_inset
 
-Credits
+Remerciements
 \begin_inset ERT
 status collapsed
 
@@ -35833,11 +35853,13 @@ target "http://www.tex.ac.uk/cgi-bin/texfaq2html"
 
 \begin_layout Bibliography
 \begin_inset LatexCommand bibitem
-key "fancyhdr"
+key "makeindex"
 
 \end_inset
 
 
+\lang english
+
 \begin_inset ERT
 status collapsed
 
@@ -35845,38 +35867,84 @@ status collapsed
 
 
 \backslash
-href{ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/fancyhdr/fancyhdr.pdf}
-{
+href{http://tug.ctan.org/indexing/makeindex/doc/manpages.dvi}{
+\end_layout
+
+\end_inset
+
+Documentation
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+}
+\end_layout
+
+\end_inset
+
+ of the program 
+\family sans
+makeindex
+\family default
+:
+\newline
+
+\begin_inset LatexCommand url
+target "http://tug.ctan.org/indexing/makeindex/doc/manpages.dvi"
+
+\end_inset
+
+
 \end_layout
 
+\begin_layout Bibliography
+\begin_inset LatexCommand bibitem
+key "caption"
+
 \end_inset
 
 
 \lang english
-Documentation
-\lang french
 
 \begin_inset ERT
 status collapsed
 
 \begin_layout Standard
 
+
+\backslash
+href{ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/caption/caption.pdf}{
+\end_layout
+
+\end_inset
+
+Documentation
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
 }
 \end_layout
 
 \end_inset
 
- 
-\lang english
-of the LaTeX-package
-\lang french
- 
+ of the LaTeX-package 
 \series bold
-fancyhdr
+caption
 \series default
 
 \begin_inset LatexCommand index
-name "Paquetages LaTeX ! fancyhdr"
+name "LaTeX-packages ! caption"
+
+\end_inset
+
+:
+\newline
+
+\begin_inset LatexCommand url
+target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/caption/caption.pdf"
 
 \end_inset
 
@@ -35885,7 +35953,7 @@ name "Paquetages LaTeX ! fancyhdr"
 
 \begin_layout Bibliography
 \begin_inset LatexCommand bibitem
-key "floatflt"
+key "fancyhdr"
 
 \end_inset
 
@@ -35897,7 +35965,7 @@ status collapsed
 
 
 \backslash
-href{ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/floatflt/floatflt.pdf}
+href{ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/fancyhdr/fancyhdr.pdf}
 {
 \end_layout
 
@@ -35924,11 +35992,21 @@ of the LaTeX-package
 \lang french
  
 \series bold
-floatflt
+fancyhdr
 \series default
 
 \begin_inset LatexCommand index
-name "Paquetages LaTeX ! floatflt"
+name "Paquetages LaTeX ! fancyhdr"
+
+\end_inset
+
+:
+\newline
+
+\lang english
+
+\begin_inset LatexCommand url
+target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/fancyhdr/fancyhdr.pdf"
 
 \end_inset
 
@@ -35983,6 +36061,16 @@ name "Paquetages LaTeX ! nomencl"
 
 \end_inset
 
+:
+\newline
+
+\lang english
+
+\begin_inset LatexCommand url
+target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/nomencl/nomencl.pdf"
+
+\end_inset
+
 
 \end_layout
 
@@ -36034,6 +36122,70 @@ name "Paquetages LaTeX ! tipa"
 
 \end_inset
 
+\SpecialChar \@.
+
+\newline
+
+\lang english
+
+\begin_inset LatexCommand url
+target "http://www.ctan.org/tex-archive/fonts/tipa/tipaman.pdf"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Bibliography
+\begin_inset LatexCommand bibitem
+key "wrapfig"
+
+\end_inset
+
+
+\lang english
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+href{ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/wrapfig/wrapfig.sty}{
+\end_layout
+
+\end_inset
+
+Documentation
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+}
+\end_layout
+
+\end_inset
+
+ of the LaTeX-package 
+\series bold
+wrapfig
+\series default
+
+\begin_inset LatexCommand index
+name "LaTeX-packages ! wrapfig"
+
+\end_inset
+
+:
+\newline
+
+\begin_inset LatexCommand url
+target "ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/wrapfig/wrapfig.sty"
+
+\end_inset
+
 
 \end_layout
 
@@ -36073,7 +36225,15 @@ status collapsed
 
  
 \lang english
-how to set up LyX for Arabic
+how to set up LyX for Arabic:
+\newline
+
+\begin_inset LatexCommand url
+target "http://wiki.lyx.org/Windows/Arabic"
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Bibliography
@@ -36112,7 +36272,15 @@ status collapsed
 
  
 \lang english
-how to set up LyX for Armenian
+how to set up LyX for Armenian:
+\newline
+
+\begin_inset LatexCommand url
+target "http://wiki.lyx.org/Windows/Armenian"
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Bibliography
@@ -36151,7 +36319,15 @@ status collapsed
 
  
 \lang english
-how to set up LyX for Farsi
+how to set up LyX for Farsi:;
+\newline
+
+\begin_inset LatexCommand url
+target "http://wiki.lyx.org/Windows/Farsi"
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Bibliography
@@ -36190,13 +36366,111 @@ status collapsed
 
  
 \lang english
-how to set up LyX for Hebrew
+how to set up LyX for Hebrew:
+\newline
+
+\begin_inset LatexCommand url
+target "http://wiki.lyx.org/Windows/Hebrew"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Bibliography
+\begin_inset LatexCommand bibitem
+key "Japanese"
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+href{http://wiki.lyx.org/Windows/Japanese}{
+\end_layout
+
+\end_inset
+
+Wiki-
+\lang english
+page
+\lang french
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+}
+\end_layout
+
+\end_inset
+
+ 
+\lang english
+how to set up LyX for Japanese:
+\newline
+
+\begin_inset LatexCommand url
+target "http://wiki.lyx.org/Windows/Japanese"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Bibliography
+\begin_inset LatexCommand bibitem
+key "LyX-func"
+
+\end_inset
+
+
+\lang english
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+href{http://wiki.lyx.org/LyX/LyxFunctionList}{
+\end_layout
+
+\end_inset
+
+Wiki-page
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+}
+\end_layout
+
+\end_inset
+
+ with a list of all available LyX-functions:
+\newline
+
+\begin_inset LatexCommand url
+target "http://wiki.lyx.org/LyX/LyxFunctionList"
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
 
 \newpage
-Bibliographie créée à partir d'une base de données BibTeX:
+
 \begin_inset ERT
 status collapsed
 
@@ -36263,6 +36537,12 @@ bibfiles "../biblio/LyXDocs"
 
 \begin_layout Standard
 
+\lang english
+The above bibliography is created from a BibTeX-database.
+\end_layout
+
+\begin_layout Standard
+
 \series bold
 \begin_inset LatexCommand printnomenclature