anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-27 19:40:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FindAdv: Re-add 'size' to the list of possible ignored formats

Browse Source
This commit is contained in:
Kornel Benko 2022-04-30 09:30:15 +02:00
parent a4663bc988
commit cbe2f61396
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Font.cpp
View File

@ -336,11 +336,18 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
p.reduce(prev.bits_); p.reduce(prev.bits_);
if (f.size() != INHERIT_SIZE) { if (f.size() != INHERIT_SIZE) {
os << '{'; if (runparams.for_search == OutputParams::NoSearch) {
++count; os << '{';
os << '\\' ++count;
<< LaTeXSizeSwitchNames[f.size()] << termcmd; os << '\\'
count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1; << LaTeXSizeSwitchNames[f.size()] << termcmd;
count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
}
else {
os << '\\'
<< LaTeXSizeSwitchNames[f.size()] << '{';
count += strlen(LaTeXSizeSwitchNames[f.size()]) + 2;
}
} }
if (f.family() != INHERIT_FAMILY) { if (f.family() != INHERIT_FAMILY) {
if (non_inherit_inset) { if (non_inherit_inset) {

9
src/lyxfind.cpp
View File

@ -88,6 +88,8 @@ class IgnoreFormats {
/// ///
bool getShape() const { return ignoreShape_; } bool getShape() const { return ignoreShape_; }
/// ///
bool getSize() const { return ignoreSize_; }
///
bool getUnderline() const { return ignoreUnderline_; } bool getUnderline() const { return ignoreUnderline_; }
/// ///
bool getMarkUp() const { return ignoreMarkUp_; } bool getMarkUp() const { return ignoreMarkUp_; }
@ -118,6 +120,8 @@ private:
/// ///
bool ignoreShape_ = false; bool ignoreShape_ = false;
/// ///
bool ignoreSize_ = true;
///
bool ignoreUnderline_ = false; bool ignoreUnderline_ = false;
/// ///
bool ignoreMarkUp_ = false; bool ignoreMarkUp_ = false;
@ -166,6 +170,9 @@ void IgnoreFormats::setIgnoreFormat(string const & type, bool value, bool fromUs
else if (type == "shape") { else if (type == "shape") {
ignoreShape_ = value; ignoreShape_ = value;
} }
else if (type == "size") {
ignoreSize_ = value;
}
else if (type == "family") { else if (type == "family") {
ignoreFamily_ = value; ignoreFamily_ = value;
} }
@ -2757,7 +2764,7 @@ void LatexInfo::buildKeys(bool isPatternString)
makeKey("textgreek|textcyrillic", KeyInfo(KeyInfo::isStandard, 1, true), false); makeKey("textgreek|textcyrillic", KeyInfo(KeyInfo::isStandard, 1, true), false);
makeKey("parbox", KeyInfo(KeyInfo::doRemove, 1, true), isPatternString); makeKey("parbox", KeyInfo(KeyInfo::doRemove, 1, true), isPatternString);
// like ('tiny{}' or '\tiny ' ... ) // like ('tiny{}' or '\tiny ' ... )
makeKey("footnotesize|tiny|scriptsize|small|large|Large|LARGE|huge|Huge", KeyInfo(KeyInfo::isSize, 0, false), isPatternString); makeKey("footnotesize|tiny|scriptsize|small|large|Large|LARGE|huge|Huge", KeyInfo(KeyInfo::isSize, 0, ignoreFormats.getSize()), isPatternString);
// Survives, like known character // Survives, like known character
// makeKey("lyx|LyX|latex|LaTeX|latexe|LaTeXe|tex|TeX", KeyInfo(KeyInfo::isChar, 0, false), isPatternString); // makeKey("lyx|LyX|latex|LaTeX|latexe|LaTeXe|tex|TeX", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);