On Wed, Sep 4, 2013 at 3:53 PM, Pavel Sanda <sa...@lyx.org> wrote: > Scott Kostyshak wrote: >> Attached is a patch that deals with the warnings thanks to your suggestions. > > Changes in xyfigure.lyx not only fix warnings but also correct typeset > so this should go in 2.1. Didn't checked xypic.lyx changes, you might want > to ping fr&ja doc maintainers but generally looks fine.
Veuillez trouver ci-joint un patch que corrige quelques avertissement signalés par LyX pour trois fichiers. Un d'entre eux est examples/fr/xypic.lyx alors je voulais voir ici si quelqu'un en a une opinion. Cordialement, Scott
From ac67a9acca8c26510de82726d5d5a9038b9bf433 Mon Sep 17 00:00:00 2001 From: Scott Kostyshak <skost...@lyx.org> Date: Fri, 23 Aug 2013 18:18:57 -0400 Subject: [PATCH] xyfigure, xypic: fix LyX math parser warnings This fixes several long "unusual contents found" warnings that were being written from LyX's math parser. Thank you to Enrico for the fix. See here for his explanation: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg180763.html There are still two such warnings that might indeed be serious, one each in fr/xypic.lyx and ja/xypic.lyx. I get an assertion from cursor movement in those insets with instant preview enabled (on both current trunk and branch). --- lib/examples/fr/xypic.lyx | 68 +++++++++++++++++++++--------------------- lib/examples/ja/xypic.lyx | 76 +++++++++++++++++++++++------------------------ lib/examples/xyfigure.lyx | 6 ++-- 3 files changed, 75 insertions(+), 75 deletions(-) diff --git a/lib/examples/fr/xypic.lyx b/lib/examples/fr/xypic.lyx index 2d549d1..3608eb9 100644 --- a/lib/examples/fr/xypic.lyx +++ b/lib/examples/fr/xypic.lyx @@ -1275,8 +1275,8 @@ Code source LyX \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar[r] & \ } +$ \end_inset @@ -1303,8 +1303,8 @@ ar \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{-->}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{-->}[r] & \ } +$ \end_inset @@ -1331,8 +1331,8 @@ ar@{-->} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{..>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{..>}[r] & \ } +$ \end_inset @@ -1359,8 +1359,8 @@ ar@{..>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{~>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{~>}[r] & \ } +$ \end_inset @@ -1387,8 +1387,8 @@ ar@{~>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{->>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{->>}[r] & \ } +$ \end_inset @@ -1415,8 +1415,8 @@ ar@{->>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{-->>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{-->>}[r] & \ } +$ \end_inset @@ -1443,8 +1443,8 @@ ar@{-->>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{>->>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{>->>}[r] & \ } +$ \end_inset @@ -1471,8 +1471,8 @@ ar@{>->>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{_{(}->}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{_{(}->}[r] & \ } +$ \end_inset @@ -1499,8 +1499,8 @@ ar@{_(->} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{^{(}->}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{^{(}->}[r] & \ } +$ \end_inset @@ -1527,8 +1527,8 @@ ar@{^(->} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{|-|}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{|-|}[r] & \ } +$ \end_inset @@ -1621,8 +1621,8 @@ Source code for LyX \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@2[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@2[r] & \ } +$ \end_inset @@ -1649,8 +1649,8 @@ ar@2 \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@3[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@3[r] & \ } +$ \end_inset @@ -1677,8 +1677,8 @@ ar@3 \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@_{->}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@_{->}[r] & \ } +$ \end_inset @@ -1705,8 +1705,8 @@ ar@_{->} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@^{->}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@^{->}[r] & \ } +$ \end_inset @@ -1733,8 +1733,8 @@ ar@^{->} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@^{>>->>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@^{>>->>}[r] & \ } +$ \end_inset @@ -1761,8 +1761,8 @@ ar@^{>>->>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{^{<}-_{>}}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{^{<}-_{>}}[r] & \ } +$ \end_inset @@ -1789,8 +1789,8 @@ ar@{^<-_>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@2{--}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@2{--}[r] & \ } +$ \end_inset diff --git a/lib/examples/ja/xypic.lyx b/lib/examples/ja/xypic.lyx index 7925cea..17ab1c9 100644 --- a/lib/examples/ja/xypic.lyx +++ b/lib/examples/ja/xypic.lyx @@ -823,11 +823,11 @@ ar[r] & Z } \end_layout \begin_layout Standard -\begin_inset Formula \xymatrix{ U \ar[ddr] \ar[drr] \ar[dr]\\ +\begin_inset Formula $\xymatrix{ U \ar[ddr] \ar[drr] \ar[dr]\\ & X \times_{Z} Y \ar[d] \ar[r] & X \ar[d]\\ & Y \ar[r] & Z } - +$ \end_inset @@ -964,11 +964,11 @@ ar[r]^g & Z } \end_layout \begin_layout LyX-Code -\begin_inset Formula \xymatrix{ U \ar[ddr]_{\psi}\ar[drr]^{\varphi}\ar[dr]|-{(x,y)}\\ +\begin_inset Formula $\xymatrix{ U \ar[ddr]_{\psi}\ar[drr]^{\varphi}\ar[dr]|-{(x,y)}\\ & X \times_{Z} Y \ar[d]^{q} \ar[r]_{p} & X \ar[d]_{f}\\ & Y \ar[r]^{g} & Z } - +$ \end_inset @@ -1145,8 +1145,8 @@ LyX中のソースコード \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar[r] & \ } +$ \end_inset @@ -1173,8 +1173,8 @@ ar \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{-->}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{-->}[r] & \ } +$ \end_inset @@ -1201,8 +1201,8 @@ ar@{-->} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{..>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{..>}[r] & \ } +$ \end_inset @@ -1229,8 +1229,8 @@ ar@{..>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{~>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{~>}[r] & \ } +$ \end_inset @@ -1257,8 +1257,8 @@ ar@{~>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{->>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{->>}[r] & \ } +$ \end_inset @@ -1285,8 +1285,8 @@ ar@{->>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{-->>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{-->>}[r] & \ } +$ \end_inset @@ -1313,8 +1313,8 @@ ar@{-->>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{>->>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{>->>}[r] & \ } +$ \end_inset @@ -1341,8 +1341,8 @@ ar@{>->>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{_{(}->}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{_{(}->}[r] & \ } +$ \end_inset @@ -1369,8 +1369,8 @@ ar@{_(->} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{^{(}->}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{^{(}->}[r] & \ } +$ \end_inset @@ -1397,8 +1397,8 @@ ar@{^(->} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{|-|}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{|-|}[r] & \ } +$ \end_inset @@ -1468,8 +1468,8 @@ LyX中のソースコード \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@2[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@2[r] & \ } +$ \end_inset @@ -1496,8 +1496,8 @@ ar@2 \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@3[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@3[r] & \ } +$ \end_inset @@ -1524,8 +1524,8 @@ ar@3 \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@_{->}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@_{->}[r] & \ } +$ \end_inset @@ -1552,8 +1552,8 @@ ar@_{->} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@^{->}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@^{->}[r] & \ } +$ \end_inset @@ -1580,8 +1580,8 @@ ar@^{->} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@^{>>->>}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@^{>>->>}[r] & \ } +$ \end_inset @@ -1608,8 +1608,8 @@ ar@^{>>->>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@{^{<}-_{>}}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@{^{<}-_{>}}[r] & \ } +$ \end_inset @@ -1636,8 +1636,8 @@ ar@{^<-_>} \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula \xymatrix{\ \ar@2{--}[r] & \ } - +\begin_inset Formula $\xymatrix{\ \ar@2{--}[r] & \ } +$ \end_inset diff --git a/lib/examples/xyfigure.lyx b/lib/examples/xyfigure.lyx index a9b22e8..79d5508 100644 --- a/lib/examples/xyfigure.lyx +++ b/lib/examples/xyfigure.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 473 +\lyxformat 474 \begin_document \begin_header \textclass article @@ -108,10 +108,10 @@ Xy \end_layout \begin_layout Standard -\begin_inset Formula \xymatrix{A\ar[d]\ar[r] & B\ar[d]\ar@{-->}[dl] \\ +\begin_inset Formula $\xymatrix{A\ar[d]\ar[r] & B\ar[d]\ar@{-->}[dl] \\ C\ar@{_{(}->}[r] & D\ar@/{}_{1pc}/[u] } - +$ \end_inset -- 1.8.1.2
