From 1429552063dfe9909dd5789b9fb1715ddee7d77d Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 18 Aug 2024 18:18:07 +0200 Subject: [PATCH] Improve output pane, as discussed in #12372 * The image scale param is shared by XHTML and DocBook * It does not only apply to math * Get rid of redundant group headers (#12902) --- lib/doc/UserGuide.lyx | 47 ++ lib/doc/de/UserGuide.lyx | 27 +- src/frontends/qt/ui/OutputUi.ui | 987 ++++++++++++++++---------------- 3 files changed, 575 insertions(+), 486 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 115085e82b..993758fa05 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -35948,6 +35948,8 @@ status collapsed \end_inset +\change_unchanged + \end_layout \end_inset @@ -53152,6 +53154,8 @@ Features \emph default manual. +\change_deleted -712698321 1723968417 + \family sans Math \begin_inset space ~ @@ -53164,6 +53168,8 @@ image scaling \family default is used for the size of equations in the output. +\change_unchanged + \end_layout \begin_layout Description @@ -53190,7 +53196,48 @@ Additional Features \end_layout \begin_layout Description + +\change_inserted -712698321 1723968656 + +\family sans +Scaling +\begin_inset space ~ +\end_inset + +of +\begin_inset space ~ +\end_inset + +generated +\begin_inset space ~ +\end_inset + +images +\family default + is the scaling factor used for images that are generated to represent some \SpecialChar LaTeX + constructs (e. +\begin_inset space \thinspace{} +\end_inset + +g., + math, + linguistics structure trees) in non-\SpecialChar LaTeX + output (XHTML, + DocBook) graphically +\change_unchanged . + +\change_inserted -712698321 1723968904 + The factor multiplies with 72 +\begin_inset space \thinspace{} +\end_inset + +dpi. + The higher the value, + thus, + the better the image quality (and the bigger the file size). +\change_unchanged + \end_layout \begin_layout Description diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 3807321782..0b1c9ec92d 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -51476,7 +51476,6 @@ Mathe-Ausgabe in XHTML Handbuchergänzungen \emph default beschrieben. - Die Skalierung wird für die Größe von Gleichungen in der Ausgabe verwendet. \end_layout \begin_layout Description @@ -51488,6 +51487,32 @@ DocBook-Ausgabe in den Handbuchergänzungen. \end_layout +\begin_layout Description +Skalierung +\begin_inset space ~ +\end_inset + +generierter +\begin_inset space ~ +\end_inset + +Grafiken ist ein Faktor, + der bestimmt, + in welcher Auflösung Grafiken erzeugt werden, + sie in einigen Nicht-\SpecialChar LaTeX +-Ausgaben verwendet werden, + um bestimmte \SpecialChar LaTeX +-Konstrukte (bspw. + mathematische Formeln oder linguistische Strukturbäume) grafisch darzustellen. + Der Faktor wird mit 72 +\begin_inset space \thinspace{} +\end_inset + +dpi multipliziert. + Je größer der Wert, + desto besser also die Qualität der Grafiken (desto größer aber auch die Datei). +\end_layout + \begin_layout Description Erlaube \begin_inset space ~ diff --git a/src/frontends/qt/ui/OutputUi.ui b/src/frontends/qt/ui/OutputUi.ui index 7bc75c1552..e18dc118fe 100644 --- a/src/frontends/qt/ui/OutputUi.ui +++ b/src/frontends/qt/ui/OutputUi.ui @@ -6,166 +6,165 @@ 0 0 - 589 - 460 + 702 + 501 Form - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 0 - - - - &LaTeX - - - - - - LaTeX Output Options - - - - - - - - Enable forward/reverse search between editor and output (e.g., SyncTeX) - - - S&ynchronize with output - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - - - - 0 - 0 - - - - C&ustom macro: - - - synccustomCB - - - - - - - Custom LaTeX preamble macro - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - + + + + + + + + 0 + 0 + + + + LyX Format + + + true + + + false + + + + + + Save all parameters in the LyX file, including ones that are frequently switched or that are specific to the user (such as the output of the tracked changes, or the document directory path). Disabling this option plays nicer in collaborative settings and with version control systems. + + + Save &transient properties + + + + + + + + + + + 0 + 0 + + + + Output Format + + + true + + + + 9 + + + 9 + + + 9 + + + 9 + + + 6 + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + - If this is checked, fragile items such as labels and index entries are moved out of moving arguments such as sections and captions. This prevents LaTeX errors that can happen in such cases. It is recommended to keep this on. + Specify the default output format (for view/update) - Put fra&gile content out of moving arguments + De&fault output format: + + + defaultFormatCO - - + + + + Specify the default output format (for view/update) + + + + + - Qt::Vertical + Qt::Orientation::Horizontal - 20 - 40 + 40 + 20 - - - - - - - &XHTML - - - - - - XHTML Output Options - - - true - - - - + + + + + + + + + 0 + 0 + + + + Output Options + + + + + + + + + false + + + + Scaling factor for images that are generated for some LaTeX constructs (e.g., math formulae) in non-LaTeX output. + - Write CSS to file + Scaling of generated &images: + + + mathimgSB - + @@ -173,7 +172,7 @@ - Scaling factor for images used for math output. + Scaling factor for images that are generated for some LaTeX constructs (e.g., math formulae) in non-LaTeX output. 0.100000000000000 @@ -189,57 +188,10 @@ - - - - - false - - - - Format to use for math output. - - - - MathML - - - - - HTML - - - - - Images - - - - - LaTeX - - - - - - - - - false - - - - Math &image scaling: - - - mathimgSB - - - - - + + - Qt::Horizontal + Qt::Orientation::Horizontal @@ -249,313 +201,378 @@ - - - - Whether to comply strictly with XHTML 1.1. - - - &Strict XHTML 1.1 - - - - - - - - false - - - - &Math output: - - - tableoutCB - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - &DocBook - - - - - - DocBook Output Options - - - true - - - - - - - 0 - 0 - - - - - false - - - - Namespace prefix to use for MathML formulae. For instance, with the <code>m</code> prefix, the MathML tags will be output like <code>m:math</code>. - - - - No prefix (namespace defined inline for each tag) - - - - - m (default) - - - - - mml - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 172 - 20 - - - - - - - - - false - - - - &Table output: - - - tableoutCB - - - - - - - - 0 - 0 - - - - - false - - - - Format to use for math output. - - - - HTML - - - - - CALS - - - - - - - - - false - - - - &MathML namespace prefix: - - - mathmlprefixCB - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - LyX Format - - - true - - - false - - - - - - Save all parameters in the LyX file, including ones that are frequently switched or that are specific to the user (such as the output of the tracked changes, or the document directory path). Disabling this option plays nicer in collaborative settings and with version control systems. - - - Save &transient properties - - - - - - - - - - Output Format - - - true - - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Specify the default output format (for view/update) - - - De&fault output format: - - - defaultFormatCO - - - - - - Specify the default output format (for view/update) + + + + + 0 + 0 + + + 0 + + + + &LaTeX + + + + + + If this is checked, fragile items such as labels and index entries are moved out of moving arguments such as sections and captions. This prevents LaTeX errors that can happen in such cases. It is recommended to keep this on. + + + Put fra&gile content out of moving arguments + + + + + + + + + Enable forward/reverse search between editor and output (e.g., SyncTeX) + + + S&ynchronize with output + + + + + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 20 + 20 + + + + + + + + + + + 0 + 0 + + + + C&ustom macro: + + + synccustomCB + + + + + + + Custom LaTeX preamble macro + + + true + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + &XHTML + + + + + + + + Whether to comply strictly with XHTML 1.1. + + + &Strict XHTML 1.1 + + + + + + + Write CSS to file + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + false + + + + &Math output: + + + tableoutCB + + + + + + + + false + + + + Format to use for math output. + + + + MathML + + + + + HTML + + + + + Images + + + + + LaTeX + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + + + &DocBook + + + + + + + + + false + + + + &Table output: + + + tableoutCB + + + + + + + + 0 + 0 + + + + + false + + + + Format to use for math output. + + + + HTML + + + + + CALS + + + + + + + + Qt::Orientation::Horizontal + + + + 178 + 38 + + + + + + + + + + + + + false + + + + &MathML namespace prefix: + + + mathmlprefixCB + + + + + + + + 0 + 0 + + + + + false + + + + Namespace prefix to use for MathML formulae. For instance, with the <code>m</code> prefix, the MathML tags will be output like <code>m:math</code>. + + + + No prefix (namespace defined inline for each tag) + + + + + m (default) + + + + + mml + + + + + + + + Qt::Orientation::Horizontal + + + + 148 + 28 + + + + + + + + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - + + + + + + Runs the LaTeX backend with the -shell-escape option (Warning: use only when really necessary) + + + &Allow running external programs + + + + - - - - Runs the LaTeX backend with the -shell-escape option (Warning: use only when really necessary) + + + + Qt::Orientation::Vertical - - &Allow running external programs + + QSizePolicy::Policy::Expanding - + + + 20 + 40 + + +