mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
xyfigure, xypic: parser warnings and typesetting
This fixes several long "unusual contents found" warnings that were being written from LyX's math parser and improves the typesetting. 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).
This commit is contained in:
Scott Kostyshak
parent
dbd3e5a0f8
commit
1a96a9cf72
@ -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
|
||||
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user