[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-cvs
Subject:    [LyX/2.2.x] Fix #9732: Inconsistent font properties for the preview and superscript insets
From:       Richard Heck <rgheck () lyx ! org>
Date:       2017-03-29 22:25:46
Message-ID: 20170329222546.8DDE2280255 () lyx ! lyx ! org
[Download RAW message or body]

commit 9450cf7b1240237890d3d22852e6f1d91255abff
Author: Enrico Forestieri <forenr@lyx.org>
Date:   Mon Mar 27 15:00:43 2017 +0200

    Fix #9732: Inconsistent font properties for the preview and superscript insets
    
    (cherry picked from commit b6f8a84a359d717a5d87f58a3403b3c6b64440e3)
---
 src/insets/InsetPreview.h |    8 +++++---
 src/insets/InsetScript.h  |    2 ++
 status.22x                |    2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/insets/InsetPreview.h b/src/insets/InsetPreview.h
index 1c80f3e..ddb481e 100644
--- a/src/insets/InsetPreview.h
+++ b/src/insets/InsetPreview.h
@@ -44,11 +44,13 @@ public:
 	Inset * clone() const { return new InsetPreview(*this); }
 
 	bool neverIndent() const { return true; }
-	
+
+	bool inheritFont() const { return false; }
+
 	InsetCode lyxCode() const { return PREVIEW_CODE; }
-	
+
 	docstring layoutName() const { return from_ascii("Preview"); }
-	
+
 	bool descendable(BufferView const & /*bv*/) const { return true; }
 
 	std::string contextMenuName() const
diff --git a/src/insets/InsetScript.h b/src/insets/InsetScript.h
index decfee3..5e5e1cf 100644
--- a/src/insets/InsetScript.h
+++ b/src/insets/InsetScript.h
@@ -82,6 +82,8 @@ public:
 	///
 	bool neverIndent() const { return true; }
 	///
+	bool inheritFont() const { return false; }
+	///
 	int plaintext(odocstringstream & ods, OutputParams const & op,
 	              size_t max_length = INT_MAX) const;
 	///
diff --git a/status.22x b/status.22x
index 8cea812..17521d5 100644
--- a/status.22x
+++ b/status.22x
@@ -227,6 +227,8 @@ What's new
 
 - Fix display of some text-mode accents in the citation preview (bug 9340).
 
+- Fix font display in preview insets (bug 9732).
+
 
 * INTERNALS
 

[prev in list] [next in list] [prev in thread] [next in thread]