[LyX/master] Adjust debug output for fonts
Enrico Forestieri
forenr at lyx.org
Thu Sep 3 19:01:37 UTC 2020
On Thu, Sep 03, 2020 at 12:47:52PM -0400, Richard Kimberly Heck wrote:
> On 9/3/20 4:55 AM, Enrico Forestieri wrote:
> > On Tue, Sep 01, 2020 at 11:54:46AM +0200, Enrico Forestieri wrote:
> >> commit 8039b34802c9e08809c02bb3682ac50439d97951
> >> Author: Enrico Forestieri <forenr at lyx.org>
> >> Date: Tue Sep 1 12:12:55 2020 +0200
> >>
> >> Adjust debug output for fonts
> >>
> >> This restores the debug output as it was intended before the
> >> introduction of the LYXERR macro that was unconditionally outputing
> >> an end of line. This is how this output was appearing until lyx 1.5:
> >>
> >> Looking for font family cmr10 ... got: cmr10
> >> got it normal!
> >>
> >> instead of as it was since lyx 1.6 and until now:
> >>
> >> Looking for font family cmr10 ...
> >> got: cmr10
> >> got it
> >> normal!
> >> ---
> >> src/frontends/qt/GuiFontLoader.cpp | 22 +++++++++++-----------
> >> src/support/debug.h | 12 ++++++++++++
> >> 2 files changed, 23 insertions(+), 11 deletions(-)
> > Riki, what about backporting this? It's risk free
>
> OK.
Done at 82b3a26a.
I would also like to backport the changes to the autocorrect file made
at 9bf8c873, 3b1ee921, 16d87a61, and 1df3151b. These are collected in
the attached patch.
This only touches the autocorrect file and is zero-risk. One feature
brought by this change that I like is that, after activating autocorrect,
you can type a delimiter and then '*' repeteadly to change its size.
--
Enrico
-------------- next part --------------
diff --git a/lib/autocorrect b/lib/autocorrect
index af2b7cf004..a9c47e1474 100644
--- a/lib/autocorrect
+++ b/lib/autocorrect
@@ -24,6 +24,7 @@
\vee * \curlyvee
\curlyvee * \curlyveeuparrow
\curlyveeuparrow * \curlyveedownarrow
+\curlyveedownarrow * \vee
< / \nless
> / \ngtr
@@ -176,12 +177,12 @@
#| \|
| * \shortmid
\shortmid * \varshortmid
-| | \||
-\|| | \interleave
-\|| * \shortparallel
+| | \|
+\| | \interleave
+\| * \shortparallel
| - \vdash
\vdash - \longvdash
-\|| - \Vdash
+\| - \Vdash
\Vdash - \longVdash
\interleave - \Vvdash
\Vvdash - \longVvdash
@@ -211,13 +212,12 @@
= @ \eqcirc
- @ \multimap
. = \doteq
-. . \ldots
+.. . \ldots
\ldots * \cdots
-\cdots * \hdots
-\hdots * \vdots
-\ddots * \ddots
-\iddots * \iddots
-\udots * \udots
+\cdots * \vdots
+\vdots * \ddots
+\ddots * \iddots
+\iddots * \ldots
: = \assign
+ = \plusassign
- = \minusassign
@@ -226,17 +226,16 @@
\ast * \times
\times * \cdot
-< * \subset
+\prec * \langle
+\langle * \subset
\subset * \in
\in * \sqsubset
\subset = \subseteq
\subseteq / \nsubseteq
\subseteq * \subseteqq
-\sqsubset * \langle
-\langle * \leftslice
-\leftslice * \subset
+\sqsubset * \leftslice
+\leftslice * <
-\subseteq / \nsubseteq
\subseteqq / \nsubseteqq
\nsubseteqq * \subsetneq
\subsetneq * \varsubsetneq
@@ -246,20 +245,23 @@
\subsetplus = \subsetpluseq
\subseteq + \subsetpluseq
\in / \nin
-> * \supset
-\supset / \nsupset
+
+\succ * \rangle
+\rangle * \supset
+\supset * \ni
+\ni * \sqsupset
\supset = \supseteq
\supseteq / \nsupseteq
\supseteq * \supseteqq
-\supseteq / \nsupseteq
-
+\sqsupset * \rightslice
+\rightslice * >
\supseteqq / \nsupseteqq
\supseteq / \supsetneq
+\supsetneq * \nsupseteq
\supset + \supsetplus
\supsetplus = \supsetpluseq
\supseteq + \supsetpluseq
-\supset * \ni
\ni / \nni
#
@@ -267,20 +269,20 @@
#
#--| \longdashv
-#| = \vDash
+| = \vDash
#\vDash = \longvDash
#||= \VDash
#||== \longVDash
-#| / \nmid
-#||/ \nparallel
-#|*/ \nshortmid
-#||*/ \nshortparallel
-#|-/ \nvdash
-#||-/ \nVdash
+#| / \nmid
+\| / \nparallel
+\shortmid / \nshortmid
+\shortparallel / \nshortparallel
+\vdash / \nvdash
+||- / \nVdash
#-|/ \ndashv
#-||/ \ndashV
-#|=/ \nvDash
-#||=/ \nVDash
+\vDash / \nvDash
+\nvDash * \nVDash
#=|/ \nDashv
#=||/ \nDashV
#
@@ -316,20 +318,20 @@
#>=*/* \gneq
#>=**/* \gneqq
#>=**/** \gvertneqq
-#[[ * \llbracket
-#]] * \rrbracket
-#EE a \amalg
-#EE d \partial
-#EE p \wp
-#EE n \cap
-#EE u \cup
-#EE w \wedge
-#\wedge * \curlywedge
-#\curlywedge * \curlywedgeuparrow
-#\curlywedgeuparrow * \curlywedgedownarrow
-#\curlywedgedownarrow * \wedges
-#EE v \vee
-#EE x \times
+[[ * \llbracket
+]] * \rrbracket
+EE a \amalg
+EE d \partial
+EE p \wp
+EE n \cap
+EE u \cup
+EE w \wedge
+\wedge * \curlywedge
+\curlywedge * \curlywedgeuparrow
+\curlywedgeuparrow * \curlywedgedownarrow
+\curlywedgedownarrow * \wedge
+EE v \vee
+EE x \times
# <***/ \nsqsubset
# <***= \sqsubseteq
@@ -342,8 +344,47 @@
# >***= \sqsupseteq
# >***=/ \nsqsupseteq
-# >**** \rangle
-# \rangle * \rightslice
+( * \bigl(
+\bigl( * \Bigl(
+\Bigl( * \biggl(
+\biggl( * \Biggl(
+\Biggl( * (
+
+) * \bigl)
+\bigl) * \Bigl)
+\Bigl) * \biggl)
+\biggl) * \Biggl)
+\Biggl) * )
+
+[ * \bigl[
+\bigl[ * \Bigl[
+\Bigl[ * \biggl[
+\biggl[ * \Biggl[
+\Biggl[ * [
+
+] * \bigl]
+\bigl] * \Bigl]
+\Bigl] * \biggl]
+\biggl] * \Biggl]
+\Biggl] * ]
+
+] * \bigl]
+\bigl] * \Bigl]
+\Bigl] * \biggl]
+\biggl] * \Biggl]
+\Biggl] * ]
+
+\{ * \bigl\{
+\bigl\{ * \Bigl\{
+\Bigl\{ * \biggl\{
+\biggl\{ * \Biggl\{
+\Biggl\{ * \{
+
+\} * \bigl\}
+\bigl\} * \Bigl\}
+\Bigl\} * \biggl\}
+\biggl\} * \Biggl\}
+\Biggl\} * \}
# EE l \bigl
# EE m \bigm
More information about the lyx-devel
mailing list