Lately, the test "tex2lyx/roundtrip/CJK.tex" fails. Bisecting and searching for the wrong looking diff led to *** 0f4c9027056a6f4f771382e9ebfc7940274bf5c0 is the first bad commit commit 0f4c9027056a6f4f771382e9ebfc7940274bf5c0 Author: Juergen Spitzmueller <sp...@lyx.org> Date: Sat Mar 10 14:58:55 2018 +0100
tex2lyx: make nested CJK parsing slightly less dumb. Fixes: #9562 :040000 040000 4cc422bc2f78eddf376ee4d52a4fab54c2b2a397 a3e56ae7deca45e8959bc1df11530937878816d2 M src *** The problematic diff looks like: **************************************** --- /usr2/src/lyx/lyx-git/src/tex2lyx/test/CJK.lyx.lyx Sun Mar 11 19:35:25 2018 +++ /BUILD/BUILDMint18/BuildLyxGitQt5.6.1local-gcc5.4.0/src/tex2lyx/test/ CJK.lyx Mon Mar 12 16:03:37 2018 @@ -130,7 +130,27 @@ \end_inset Japanese - (this CJK environment will be put in ERT because LyX supports only one CJK + (this +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout +C +\end_layout + +\end_inset + +JK environment will be put in ERT because LyX supports only one +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout +C +\end_layout + +\end_inset + +JK font mapping per document, this environment uses the \begin_inset ERT status collapsed *************************************************** Kornel
signature.asc
Description: This is a digitally signed message part.