Re: [LyX/master] Integrate theorem definition in layout
On Sun, May 04, 2025 at 01:31:22PM +0200, Scott Kostyshak wrote: > On Sun, May 04, 2025 at 01:08:02PM +0200, Kornel Benko wrote: > > Am Sun, 4 May 2025 12:55:46 +0200 > > schrieb Scott Kostyshak : > > > > > On Sun, May 04, 2025 at 12:35:01PM +0200, Kornel Benko wrote: > > > > Am Sun, 04 May 2025 12:14:48 +0200 > > > > schrieb "Jürgen Spitzmüller" : > > > > > > > > > Am Sonntag, dem 04.05.2025 um 11:42 +0200 schrieb Jürgen Spitzmüller: > > > > > > > > > > > We might want to do something to fix the problem this file > > > > > > documents, > > > > > > though. > > > > > > > > > > This is done now. This file is now imported properly (so it does no > > > > > longer create a LaTeX error). > > > > > > > > > > Now of course the test result differs. The PDF should probably be > > > > > replaced by the new one. > > > > > > > > > > > > > Done at 7a7e9e52 > > > > > > Great! > > > > > > Kornel, the test still fails for me. See the attached screenshot of > > > diffpdf. I guess we get different PDF output for the same .tex file? > > > > > > If you do a git pull and a fresh build, does the test pass for you? > > > > > > Thanks, > > > Scott > > > > I see the same. So an amend of amend has to follow. > > Thanks, I'll run the tests when I get home. Test now passes. Thanks. Scott signature.asc Description: PGP signature -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
On Sun, May 04, 2025 at 01:08:02PM +0200, Kornel Benko wrote: > Am Sun, 4 May 2025 12:55:46 +0200 > schrieb Scott Kostyshak : > > > On Sun, May 04, 2025 at 12:35:01PM +0200, Kornel Benko wrote: > > > Am Sun, 04 May 2025 12:14:48 +0200 > > > schrieb "Jürgen Spitzmüller" : > > > > > > > Am Sonntag, dem 04.05.2025 um 11:42 +0200 schrieb Jürgen Spitzmüller: > > > > > We might want to do something to fix the problem this file documents, > > > > > though. > > > > > > > > This is done now. This file is now imported properly (so it does no > > > > longer create a LaTeX error). > > > > > > > > Now of course the test result differs. The PDF should probably be > > > > replaced by the new one. > > > > > > > > > > Done at 7a7e9e52 > > > > Great! > > > > Kornel, the test still fails for me. See the attached screenshot of > > diffpdf. I guess we get different PDF output for the same .tex file? > > > > If you do a git pull and a fresh build, does the test pass for you? > > > > Thanks, > > Scott > > I see the same. So an amend of amend has to follow. Thanks, I'll run the tests when I get home. Scott signature.asc Description: PGP signature -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
Am Sun, 4 May 2025 12:55:46 +0200 schrieb Scott Kostyshak : > On Sun, May 04, 2025 at 12:35:01PM +0200, Kornel Benko wrote: > > Am Sun, 04 May 2025 12:14:48 +0200 > > schrieb "Jürgen Spitzmüller" : > > > > > Am Sonntag, dem 04.05.2025 um 11:42 +0200 schrieb Jürgen Spitzmüller: > > > > We might want to do something to fix the problem this file documents, > > > > though. > > > > > > This is done now. This file is now imported properly (so it does no > > > longer create a LaTeX error). > > > > > > Now of course the test result differs. The PDF should probably be > > > replaced by the new one. > > > > > > > Done at 7a7e9e52 > > Great! > > Kornel, the test still fails for me. See the attached screenshot of > diffpdf. I guess we get different PDF output for the same .tex file? > > If you do a git pull and a fresh build, does the test pass for you? > > Thanks, > Scott I see the same. So an amend of amend has to follow. Kornel pgp70OFZHFFPu.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
On Sun, May 04, 2025 at 12:35:01PM +0200, Kornel Benko wrote: > Am Sun, 04 May 2025 12:14:48 +0200 > schrieb "Jürgen Spitzmüller" : > > > Am Sonntag, dem 04.05.2025 um 11:42 +0200 schrieb Jürgen Spitzmüller: > > > We might want to do something to fix the problem this file documents, > > > though. > > > > This is done now. This file is now imported properly (so it does no > > longer create a LaTeX error). > > > > Now of course the test result differs. The PDF should probably be > > replaced by the new one. > > > > Done at 7a7e9e52 Great! Kornel, the test still fails for me. See the attached screenshot of diffpdf. I guess we get different PDF output for the same .tex file? If you do a git pull and a fresh build, does the test pass for you? Thanks, Scott signature.asc Description: PGP signature -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
Am Sun, 04 May 2025 12:14:48 +0200 schrieb "Jürgen Spitzmüller" : > Am Sonntag, dem 04.05.2025 um 11:42 +0200 schrieb Jürgen Spitzmüller: > > We might want to do something to fix the problem this file documents, > > though. > > This is done now. This file is now imported properly (so it does no > longer create a LaTeX error). > > Now of course the test result differs. The PDF should probably be > replaced by the new one. > Done at 7a7e9e52 Kornel pgpXIu8sVUcNP.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
Am Sonntag, dem 04.05.2025 um 11:58 +0200 schrieb Kornel Benko: > The new imported pdf starts numbering inside a section (1.1., 1.2., > 1.3.) while the previous shows (1., 2., 3.) Which is correct! Cf. the tex file. -- Jürgen signature.asc Description: This is a digitally signed message part -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
Am Sonntag, dem 04.05.2025 um 11:42 +0200 schrieb Jürgen Spitzmüller: > We might want to do something to fix the problem this file documents, > though. This is done now. This file is now imported properly (so it does no longer create a LaTeX error). Now of course the test result differs. The PDF should probably be replaced by the new one. -- Jürgen signature.asc Description: This is a digitally signed message part -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
On Sun, May 04, 2025 at 11:58:48AM +0200, Kornel Benko wrote: > Am Sun, 04 May 2025 11:42:00 +0200 > schrieb "Jürgen Spitzmüller" : > > > Am Samstag, dem 03.05.2025 um 21:24 +0200 schrieb Scott Kostyshak: > > > Starting with this commit, the following ctest fails: > > > > > > BATCH_AMS-import > > > > > > I don't know much about these BATCH tests, but from what I > > > understand, it has to do with the file development/batchtests/ams- > > > import.tex. If you import that file before this commit and view as > > > PDF, and then do the same with this commit, the PDFs look different. > > > > Tex2lyx import of theorems was not yet adapted to the new format. It is > > now. > > > > This specific file does not compile (which seems intentional) due to > > duplicated theorem definitions, so the produced PDF is buggy. > > Due to the different order of theorem definitions we have now, the > > buggy PDF looks a bit different, but this is OK IMHO. > > > > We might want to do something to fix the problem this file documents, > > though. Sounds good. Thanks for taking a look! I tried to compile but now I'm getting an error (because I use -Werror) from a warning. I'll start a new thread for that. > The new imported pdf starts numbering inside a section (1.1., 1.2., 1.3.) > while the > previous shows (1., 2., 3.) > > Nice to see with using 'diffpdf'. +1 Scott signature.asc Description: PGP signature -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
Am Sun, 04 May 2025 11:42:00 +0200 schrieb "Jürgen Spitzmüller" : > Am Samstag, dem 03.05.2025 um 21:24 +0200 schrieb Scott Kostyshak: > > Starting with this commit, the following ctest fails: > > > > BATCH_AMS-import > > > > I don't know much about these BATCH tests, but from what I > > understand, it has to do with the file development/batchtests/ams- > > import.tex. If you import that file before this commit and view as > > PDF, and then do the same with this commit, the PDFs look different. > > Tex2lyx import of theorems was not yet adapted to the new format. It is > now. > > This specific file does not compile (which seems intentional) due to > duplicated theorem definitions, so the produced PDF is buggy. > Due to the different order of theorem definitions we have now, the > buggy PDF looks a bit different, but this is OK IMHO. > > We might want to do something to fix the problem this file documents, > though. > The new imported pdf starts numbering inside a section (1.1., 1.2., 1.3.) while the previous shows (1., 2., 3.) Nice to see with using 'diffpdf'. Kornel pgp0ftplrUz2N.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
Am Samstag, dem 03.05.2025 um 21:24 +0200 schrieb Scott Kostyshak: > Starting with this commit, the following ctest fails: > > BATCH_AMS-import > > I don't know much about these BATCH tests, but from what I > understand, it has to do with the file development/batchtests/ams- > import.tex. If you import that file before this commit and view as > PDF, and then do the same with this commit, the PDFs look different. Tex2lyx import of theorems was not yet adapted to the new format. It is now. This specific file does not compile (which seems intentional) due to duplicated theorem definitions, so the produced PDF is buggy. Due to the different order of theorem definitions we have now, the buggy PDF looks a bit different, but this is OK IMHO. We might want to do something to fix the problem this file documents, though. -- Jürgen signature.asc Description: This is a digitally signed message part -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
On Fri, Apr 25, 2025 at 02:28:38PM +, Juergen Spitzmueller wrote: > commit 7d5952201dfdcc464bf86a5b2d8a4f189e11bdf6 > Author: Juergen Spitzmueller > Date: Fri Apr 25 16:23:50 2025 +0200 > > Integrate theorem definition in layout > > Rather than using verbatim \newtheorem definitions in the Preamble > tag, introduce dedicated layout tags from which the definition > will be set up. > > This prevents redundant code, but more importantly, it is required > for support of theorems via cleveref and zref-clever. They support > many theorems by default, but not the way we used them (see #13176). > > Some support is implemented with this commit, some still needs to be > done. > > Layout format change. Starting with this commit, the following ctest fails: BATCH_AMS-import I don't know much about these BATCH tests, but from what I understand, it has to do with the file development/batchtests/ams-import.tex. If you import that file before this commit and view as PDF, and then do the same with this commit, the PDFs look different. Scott signature.asc Description: PGP signature -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
Am Freitag, dem 25.04.2025 um 15:04 -0400 schrieb Richard Kimberly Heck: > This is just to encourage those of us who use theorems and the like > to > test this. I've looked through the code, and (no surprise here) it > looks > right, but this is probably delicate. I'll test it myself this > weekend. Yes, thanks! Note that there are still pending issues wrt cross-referencing. -- Jürgen -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Integrate theorem definition in layout
This is just to encourage those of us who use theorems and the like to test this. I've looked through the code, and (no surprise here) it looks right, but this is probably delicate. I'll test it myself this weekend. Riki On 4/25/25 10:28 AM, Juergen Spitzmueller wrote: commit 7d5952201dfdcc464bf86a5b2d8a4f189e11bdf6 Author: Juergen Spitzmueller Date: Fri Apr 25 16:23:50 2025 +0200 Integrate theorem definition in layout Rather than using verbatim \newtheorem definitions in the Preamble tag, introduce dedicated layout tags from which the definition will be set up. This prevents redundant code, but more importantly, it is required for support of theorems via cleveref and zref-clever. They support many theorems by default, but not the way we used them (see #13176). Some support is implemented with this commit, some still needs to be done. Layout format change. lib/doc/Customization.lyx | 383 - lib/doc/de/Customization.lyx | 326 -- lib/layouts/AEA.layout | 40 +++ lib/layouts/maa-monthly.layout | 5 +- lib/layouts/theorems-ams-bytype.inc| 103 +++--- lib/layouts/theorems-ams-chap-bytype.inc | 168 - lib/layouts/theorems-ams-extended-bytype.module| 149 .../theorems-ams-extended-chap-bytype.module | 199 +-- lib/layouts/theorems-ams-extended.module | 165 + lib/layouts/theorems-ams.inc | 112 +++--- lib/layouts/theorems-bytype.inc| 105 +++--- lib/layouts/theorems-chap-bytype.module| 108 +- lib/layouts/theorems-chap.module | 9 +- lib/layouts/theorems-named.module | 13 +- lib/layouts/theorems-sec-bytype.module | 60 +--- lib/layouts/theorems-sec.module| 5 +- lib/layouts/theorems-starred.inc | 100 +++--- lib/layouts/theorems.inc | 113 +++--- lib/scripts/layout2layout.py | 8 +- src/BufferParams.cpp | 1 + src/LaTeXFeatures.cpp | 47 +++ src/LaTeXFeatures.h| 15 + src/Layout.cpp | 37 ++ src/Layout.h | 25 ++ src/TextClass.cpp | 2 +- 25 files changed, 1417 insertions(+), 881 deletions(-) -- Richard Kimberly (Riki) Heck Professor of Philosophy and Professor of Linguistics Brown University Pronouns: they/them/their Website: http://rkheck.frege.org/ -- lyx-devel mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-devel
