diff --git a/lib/examples/xypic.lyx b/lib/examples/xypic.lyx index edf2dc7641..b3e227c060 100644 --- a/lib/examples/xypic.lyx +++ b/lib/examples/xypic.lyx @@ -82,7 +82,7 @@ \pdf_colorlinks true \pdf_backref false \pdf_pdfusetitle false -\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true,pdfstartview=XYZ, plainpages=false, pdfpagelabels" +\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true,pdfstartview=XYZ, plainpages=false" \papersize a4paper \use_geometry false \use_amsmath 1 @@ -95,6 +95,7 @@ \paperorientation portrait \suppress_date false \use_refstyle 0 +\notefontcolor #0000ff \index Index \shortcut idx \color #008000 @@ -230,8 +231,6 @@ xypic \begin_inset Graphics filename xyfigure.png width 75col% - BoundingBox 0bp 0bp 580bp 440bp - clip \end_inset @@ -2860,7 +2859,14 @@ Xy \end_inset --manual, for instance, +-manual, +\begin_inset CommandInset citation +LatexCommand cite +key "xypic manual" + +\end_inset + +, for instance, \family typewriter \backslash @@ -2884,7 +2890,11 @@ Xy \end_inset --matrix with row spacing of 1 pica. +-matrix with row spacing of 1 +\begin_inset space ~ +\end_inset + +pica. Similarly, \family typewriter @@ -2902,26 +2912,32 @@ xymatrix@C= } \family default allows to modify the space between columns. - Unfortunately, these commands do currently not work inside LyX, as the - @-character is interpreted by LyX as ending the -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -Xy -\end_layout - + Unfortunately, one cannot type +\begin_inset Quotes eld \end_inset --matrix-macro. - + +\family typewriter + +\backslash +xymatrix@R=1pc +\family default + +\begin_inset Quotes erd +\end_inset + + into a formula to get the desired matrix because the @-character is interpreted + by LyX as ending the +\family typewriter + +\backslash +xymatrix +\family default + command. + But there is another way of getting the desired matrix: \end_layout \begin_layout Standard -Knowing that \begin_inset ERT status collapsed @@ -2938,7 +2954,11 @@ Xy \begin_inset space ~ \end_inset - stores the values for row-spacing and column-spacing in the variables + stores the values for row-spacing and column-spacing in the variables +\begin_inset Newline newline +\end_inset + + \family typewriter \backslash @@ -2950,17 +2970,14 @@ xymatrixrowsep@ \backslash xymatrixrowsep@ \family default -, add the following macro to the preamble ( +. + So one can add the following macro to the preamble ( \family sans Layout\SpecialChar \menuseparator Document\SpecialChar \menuseparator Preamble \family default ): -\begin_inset Newpage pagebreak -\end_inset - - \end_layout \begin_layout LyX-Code @@ -2968,7 +2985,7 @@ Preamble \backslash newcommand{ \backslash -xyR}[1]{% +xyR}[1]{% \end_layout \begin_layout LyX-Code @@ -2979,10 +2996,6 @@ xydef@ xymatrixrowsep@{#1}} \end_layout -\begin_layout LyX-Code - -\end_layout - \begin_layout Standard A macro \family typewriter @@ -3005,7 +3018,7 @@ xymatrixcolsep@ . Now, a figure can be scaled by entering \backslash -xyR{...} into the +xyR{ into the formula before the \begin_inset ERT status collapsed @@ -3040,9 +3053,51 @@ xyC Don't forget the backslashes and remember, that the closing brace is automatica lly supplied by LyX. Inside the braces enter the dimensions. - The default is +\begin_inset Newline newline +\end_inset + + +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +Note: +\series default + These commands affect all following +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +Xy +\end_layout + +\end_inset + +-matrices. + Therefore don't forget to reset the values to default after the usage of + \family typewriter -2pt + +\backslash +xyR +\family default + etc.. +\end_layout + +\end_inset + + +\begin_inset Newline newline +\end_inset + +The default is +\family typewriter +2pc \family default . Here you see a diagram which is squashed vertically and stretched horizontally @@ -3050,17 +3105,14 @@ lly supplied by LyX. \family typewriter \backslash -xyR{9pc} +xyR{0.5pc} \backslash -xyC{.5pc} +xyC{9pc} \family default : -\end_layout - -\begin_layout Standard \begin_inset Formula \[ -\xyC{.5pc}\xyC{9pc}\xymatrix{A\ar[r]\ar[d] & B\\ +\xyR{.5pc}\xyC{9pc}\xymatrix{A\ar[r]\ar[d] & B\\ C\ar@{}[ur]|{\text{{horizontal stretch}}} } \] @@ -3068,6 +3120,20 @@ C\ar@{}[ur]|{\text{{horizontal stretch}}} \end_inset +\begin_inset Formula $\xyR{2pc}\xyC{2pc}$ +\end_inset + + +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout +reset to default +\end_layout + +\end_inset + + \end_layout \begin_layout Subsection @@ -3312,20 +3378,7 @@ horizontal stretch \begin_layout Subsection Further \family typewriter - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash Xy -\end_layout - -\end_inset - - \family default -tricks \end_layout @@ -3429,40 +3482,11 @@ ERT Instant preview \family default insets. - A good and rather systematic introduction to -\family typewriter - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -Xy -\end_layout - -\end_inset - - -\family default --matrix is -\begin_inset CommandInset citation -LatexCommand cite -key "Ouvaton" - -\end_inset - -. - Even if you share with me the disadvantage of not being fluent in Esperanto, - you will be able to understand most of it. - \end_layout \begin_layout Bibliography \begin_inset CommandInset bibitem LatexCommand bibitem -label "1" key "xypic manual" \end_inset @@ -3486,22 +3510,7 @@ Xy -pic User's Guide \emph default . - Version 3.7, Feb. - 16, 1999. - Available as part of the -\family typewriter -xypic -\family default - LaTeX package. - -\end_layout - -\begin_layout Bibliography -\begin_inset CommandInset bibitem -LatexCommand bibitem -label "2" -key "instant-preview" - +\begin_inset Newline newline \end_inset @@ -3510,7 +3519,50 @@ status collapsed \begin_layout Plain Layout -http://www.tug.org/tex-archive/help/Catalogue/entries/preview-latex.html +http://mirrors.ctan.org/macros/generic/diagrams/xypic/xy/doc/xyguide.pdf +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Bibliography +\begin_inset CommandInset bibitem +LatexCommand bibitem +key "xypic reference" + +\end_inset + +Kristoffer H. + Rose and Ross Moore: +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +Xy +\end_layout + +\end_inset + + +\emph on +-pic Reference Manual +\emph default +. +\begin_inset Newline newline +\end_inset + + +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +http://mirrors.ctan.org/macros/generic/diagrams/xypic/xy/doc/xyrefer.pdf \end_layout \end_inset @@ -3521,18 +3573,34 @@ http://www.tug.org/tex-archive/help/Catalogue/entries/preview-latex.html \begin_layout Bibliography \begin_inset CommandInset bibitem LatexCommand bibitem -label "3" key "xypic" \end_inset +Homepage of the package +\begin_inset ERT +status collapsed +\begin_layout Plain Layout + + +\backslash +Xy +\end_layout + +\end_inset + + +\emph on +-pic +\emph default +: \begin_inset Flex URL status collapsed \begin_layout Plain Layout -http://www.tug.org/tex-archive/help/Catalogue/entries/xypic.html +http://www.ctan.org/pkg/xypic \end_layout \end_inset @@ -3543,12 +3611,36 @@ http://www.tug.org/tex-archive/help/Catalogue/entries/xypic.html \begin_layout Bibliography \begin_inset CommandInset bibitem LatexCommand bibitem -label "4" -key "AUCTeX" +key "instant-preview" + +\end_inset + +Homepage of preview-latex: +\begin_inset Newline newline +\end_inset + + +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +http://www.gnu.org/software/auctex/preview-latex.html +\end_layout \end_inset +\end_layout + +\begin_layout Bibliography +\begin_inset CommandInset bibitem +LatexCommand bibitem +key "AUCTeX" + +\end_inset + +Homepage of AUCTeX: \begin_inset Flex URL status collapsed @@ -3565,7 +3657,6 @@ http://www.gnu.org/software/auctex/ \begin_layout Bibliography \begin_inset CommandInset bibitem LatexCommand bibitem -label "5" key "Lauda" \end_inset @@ -3592,8 +3683,12 @@ Xy tutorial with an archive of examples \emph default . +\begin_inset Newline newline +\end_inset + + \begin_inset Flex URL -status collapsed +status open \begin_layout Plain Layout @@ -3603,50 +3698,6 @@ http://www.math.columbia.edu/~lauda/xy/ \end_inset -\end_layout - -\begin_layout Bibliography -\begin_inset CommandInset bibitem -LatexCommand bibitem -label "6" -key "Ouvaton" - -\end_inset - -Filipp Ouvaton: -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -Xy -\end_layout - -\end_inset - - -\emph on --pic -\emph default -: -\emph on -Enkonduko pri Xymatrix -\emph default -. - -\begin_inset Flex URL -status collapsed - -\begin_layout Plain Layout - -http://filip.ouvaton.org/xypic/xymatrix/index.html -\end_layout - -\end_inset - - \end_layout \end_body diff --git a/status.20x b/status.20x index 0feba06d59..4820660e4b 100644 --- a/status.20x +++ b/status.20x @@ -142,17 +142,20 @@ What's new - Do not create an empty environment variable LC_ALL when launching external processes (bug 8537). + * DOCUMENTATION AND LOCALIZATION - Make the thesis template compilable again. - Fix compilation of modernCV example file for all themes. +- Update the Xy-pic manual to avoid any LaTeX and LyX warning when processing + the file. + * LYXHTML - * TEX2LYX - Correct import of the command \framebox (bug 8223).