commit d037e3ead1be1e49c4ca3a8dc11617457c003982
Author: Kornel Benko <[email protected]>
Date: Mon Jul 14 16:39:03 2025 +0200
Revert "Cmake build: turn on -Wdelete-non-abstract-non-virtual-dtor and
-Wdelete-abstract-non-virtual-dtor"
Committed from wrong directory
This reverts commit 6ae9240bbb688268efaabc774d24a8bd3eac0a0c.
---
development/checkurls/knownInvalidURLS | 6 ----
lib/doc/Additional.lyx | 4 +--
lib/doc/EmbeddedObjects.lyx | 2 +-
lib/doc/ar/UserGuide.lyx | 2 +-
lib/doc/de/Additional.lyx | 4 +--
lib/doc/es/Additional.lyx | 4 +--
lib/doc/es/EmbeddedObjects.lyx | 2 +-
lib/doc/es/UserGuide.lyx | 2 +-
lib/doc/fr/Additional.lyx | 4 +--
lib/doc/fr/UserGuide.lyx | 2 +-
lib/doc/ja/Additional.lyx | 4 +--
lib/doc/ru/Additional.lyx | 4 +--
lib/doc/ru/EmbeddedObjects.lyx | 2 +-
src/OutputParams.h | 4 +--
src/graphics/PreviewLoader.cpp | 2 +-
src/lyxfind.cpp | 64 ++++++----------------------------
16 files changed, 30 insertions(+), 82 deletions(-)
diff --git a/development/checkurls/knownInvalidURLS
b/development/checkurls/knownInvalidURLS
index 837c6fce37..80dc08cd30 100644
--- a/development/checkurls/knownInvalidURLS
+++ b/development/checkurls/knownInvalidURLS
@@ -1,16 +1,10 @@
http://www.uon.edu/doe
-https://www.uon.edu/doe
ftp://www.test.test
http://www.test.test
#proto://host.xx.ab/abcd
http://example.com/%20foo
-https://example.com/%20foo
http://ftp.edpsciences.org/pub/aa/aa-package.zip
-https://ftp.edpsciences.org/pub/aa/aa-package.zip
http://www.istri.fr/spip/zip/CMCDDE.zip
http://prst-per.aps.org/multimedia/PRSTPER/v4/i1/e010101/e010101_vid1a.mpg
-https://prst-per.aps.org/multimedia/PRSTPER/v4/i1/e010101/e010101_vid1a.mpg
http://prst-per.aps.org/multimedia/PRSTPER/v4/i1/e010101/e010101_vid1b.mpg
-https://prst-per.aps.org/multimedia/PRSTPER/v4/i1/e010101/e010101_vid1b.mpg
http://www.issn.org/en/node/344
-https://www.issn.org/en/node/344
diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index 02b9eb373e..b519aed9ce 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -27770,7 +27770,7 @@ https://www.nongnu.org/cvs/
status collapsed
\begin_layout Plain Layout
-https://cvs.nongnu.org
+https://cvs.nongnu.org/
\end_layout
\end_inset
@@ -29469,7 +29469,7 @@ literal "false"
\begin_inset CommandInset href
LatexCommand href
name "TortoiseSVN"
-target "https://tortoisesvn.net";
+target "https://tortoisesvn.net/";
literal "false"
\end_inset
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 36568207f0..53d1cc1db7 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -42558,7 +42558,7 @@ figure This template supports specific scalable images
derived from scalable vec
\begin_inset CommandInset href
LatexCommand href
name "Inkscape"
-target "https://inkscape.org";
+target "https://inkscape.org/";
literal "false"
\end_inset
diff --git a/lib/doc/ar/UserGuide.lyx b/lib/doc/ar/UserGuide.lyx
index 105861ff24..c890320faf 100644
--- a/lib/doc/ar/UserGuide.lyx
+++ b/lib/doc/ar/UserGuide.lyx
@@ -54307,7 +54307,7 @@ status collapsed
\begin_layout Plain Layout
-https://texfaq.org
+https://texfaq.org/
\end_layout
\end_inset
diff --git a/lib/doc/de/Additional.lyx b/lib/doc/de/Additional.lyx
index a10676ffd7..6989c410d7 100644
--- a/lib/doc/de/Additional.lyx
+++ b/lib/doc/de/Additional.lyx
@@ -27872,7 +27872,7 @@ status collapsed
\begin_layout Plain Layout
-https://cvs.nongnu.org
+https://cvs.nongnu.org/
\end_layout
\end_inset
@@ -29655,7 +29655,7 @@ literal "false"
\begin_inset CommandInset href
LatexCommand href
name "TortoiseSVN"
-target "https://tortoisesvn.net";
+target "https://tortoisesvn.net/";
literal "false"
\end_inset
diff --git a/lib/doc/es/Additional.lyx b/lib/doc/es/Additional.lyx
index 80c50d734f..cf21d5a52f 100644
--- a/lib/doc/es/Additional.lyx
+++ b/lib/doc/es/Additional.lyx
@@ -22530,7 +22530,7 @@ status collapsed
\begin_layout Plain Layout
-https://cvs.nongnu.org
+https://cvs.nongnu.org/
\end_layout
\end_inset
@@ -24450,7 +24450,7 @@ literal "false"
\begin_inset CommandInset href
LatexCommand href
name "TortoiseSVN"
-target "https://tortoisesvn.net";
+target "https://tortoisesvn.net/";
literal "false"
\end_inset
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index ab7980d1d8..59892fb5e2 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -40295,7 +40295,7 @@ Inkscape
\begin_inset CommandInset href
LatexCommand href
name "Inkscape"
-target "https://inkscape.org";
+target "https://inkscape.org/";
literal "false"
\end_inset
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index f54a79ee6e..832afaa307 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -52256,7 +52256,7 @@ status collapsed
\begin_layout Plain Layout
-https://texfaq.org
+https://texfaq.org/
\end_layout
\end_inset
diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx
index fec4dfb044..d2eb901219 100644
--- a/lib/doc/fr/Additional.lyx
+++ b/lib/doc/fr/Additional.lyx
@@ -30028,7 +30028,7 @@ status collapsed
\begin_layout Plain Layout
-https://cvs.nongnu.org
+https://cvs.nongnu.org/
\end_layout
\end_inset
@@ -32074,7 +32074,7 @@ literal "false"
\begin_inset CommandInset href
LatexCommand href
name "TortoiseSVN"
-target "https://tortoisesvn.net";
+target "https://tortoisesvn.net/";
literal "false"
\end_inset
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index ab08db2ba9..450b7bebed 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -58428,7 +58428,7 @@ status collapsed
\begin_layout Plain Layout
-https://texfaq.org
+https://texfaq.org/
\end_layout
\end_inset
diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index 1722985a9b..570aada229 100644
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -27599,7 +27599,7 @@ status collapsed
\begin_layout Plain Layout
-https://cvs.nongnu.org
+https://cvs.nongnu.org/
\end_layout
\end_inset
@@ -29388,7 +29388,7 @@ literal "false"
\begin_inset CommandInset href
LatexCommand href
name "TortoiseSVN"
-target "https://tortoisesvn.net";
+target "https://tortoisesvn.net/";
literal "false"
\end_inset
diff --git a/lib/doc/ru/Additional.lyx b/lib/doc/ru/Additional.lyx
index 15aca7c5de..2dab1e20e2 100644
--- a/lib/doc/ru/Additional.lyx
+++ b/lib/doc/ru/Additional.lyx
@@ -13926,7 +13926,7 @@ status collapsed
\begin_layout Plain Layout
-https://cvs.nongnu.org
+https://cvs.nongnu.org/
\end_layout
\end_inset
@@ -15634,7 +15634,7 @@ literal "false"
\begin_inset CommandInset href
LatexCommand href
name "TortoiseSVN"
-target "https://tortoisesvn.net";
+target "https://tortoisesvn.net/";
literal "false"
\end_inset
diff --git a/lib/doc/ru/EmbeddedObjects.lyx b/lib/doc/ru/EmbeddedObjects.lyx
index eca5fa6fbb..6eac79851d 100644
--- a/lib/doc/ru/EmbeddedObjects.lyx
+++ b/lib/doc/ru/EmbeddedObjects.lyx
@@ -40608,7 +40608,7 @@ Inkscape Этот шаблон поддерживает определенные
\begin_inset CommandInset href
LatexCommand href
name "Inkscape"
-target "https://inkscape.org";
+target "https://inkscape.org/";
literal "false"
\end_inset
diff --git a/src/OutputParams.h b/src/OutputParams.h
index ab93ce43f2..f6d1830dc1 100644
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -449,14 +449,12 @@ public:
SearchWithDeleted = 1,
SearchWithoutDeleted = 2,
SearchQuick = 4,
- SearchNonOutput = 8,
- SearchDifferSpaces = 16
+ SearchNonOutput = 8
};
inline bool find_effective(void) const { return (for_search !=
OutputParams::NoSearch); }
inline bool find_with_non_output() const { return ((for_search &
OutputParams::SearchNonOutput) != 0); }
inline bool find_with_deleted() const { return ((for_search &
OutputParams::SearchWithDeleted) != 0); }
- inline bool find_discriminate_spaces() const { return ((for_search &
OutputParams::SearchDifferSpaces) != 0); }
inline void find_set_feature(enum Search set_) { for_search = set_; }
inline void find_add_feature(enum Search add_) { for_search |= add_; }
inline void find_clean_features(void) { for_search =
OutputParams::NoSearch; }
diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 535effff48..25dcb2fd61 100644
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -624,7 +624,7 @@ void PreviewLoader::Impl::startLoading(bool wait)
// output format (see bug 9371).
Flavor flavor = docformat
? buffer_.params().getOutputFlavor()
- : Flavor::PdfLaTeX;
+ : Flavor::LaTeX;
if (buffer_.params().encoding().package() == Encoding::japanese) {
latexparam = " --latex=platex";
flavor = Flavor::LaTeX;
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 9665ed94a6..df71e12532 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -105,10 +105,6 @@ class IgnoreFormats {
///
bool getNonContent() const { return searchNonContent_; }
///
- void setSpaceType(bool value);
- ///
- bool getSpaceType() const { return ignoreSpaceType_; }
- ///
void setIgnoreFormat(string const & type, bool value, bool fromUser =
true);
private:
@@ -139,8 +135,6 @@ private:
bool ignoreDeleted_ = true;
///
bool searchNonContent_ = true;
- ///
- bool ignoreSpaceType_ = false;
};
void IgnoreFormats::setIgnoreFormat(string const & type, bool value, bool
fromUser)
@@ -192,9 +186,6 @@ void IgnoreFormats::setIgnoreFormat(string const & type,
bool value, bool fromUs
else if (type == "non-output-content") {
searchNonContent_ = !value;
}
- else if (type == "ignore-space-type") {
- ignoreSpaceType_ = value;
- }
}
// The global variable that can be changed from outside
@@ -827,15 +818,10 @@ typedef vector<pair<string, string> > Escapes;
static string getRegexSpaceCount(int count)
{
if (count > 0) {
- string whitespace;
- if (ignoreFormats.getSpaceType())
- whitespace = "[\\s" + accents["negthinspace{}"] +
accents["negmedspace{}"] + accents["negthickspace{}"] + "]";
- else
- whitespace = "\\s";
if (count > 1)
- return whitespace + "{" + std::to_string(count) + "}";
+ return "\\s{" + std::to_string(count) + "}";
else
- return whitespace;
+ return "\\s";
}
return "";
}
@@ -893,17 +879,6 @@ string string2regex(string in)
i += 2;
}
}
- else if (ignoreFormats.getSpaceType()
- && (tempx[i] == '\363')
- && (tempx[i+1] == '\260')
- && (tempx[i+2] == '\200')
- && ((tempx[i+3] == '\203') || (tempx[i+3] == '\205') ||
(tempx[i+3] == '\207'))) {
- // negthinspace
- // negmedspace
- // negthickspace
- blanks++;
- i += 3;
- }
else {
if (blanks > 0) {
temp += getRegexSpaceCount(blanks);
@@ -945,7 +920,7 @@ string correctRegex(string t, bool withformat)
* and \{, \}, \[, \] => {, }, [, ]
*/
string s("");
- static std::regex wordre("(\\\\)*(\\\\(( |[A-Za-z]+|[\\{\\}%,>!;:])(
|\\{\\})?|[\\[\\]\\{\\}]))");
+ static std::regex wordre("(\\\\)*(\\\\(( |[A-Za-z]+|[\\{\\}%])(
|\\{\\})?|[\\[\\]\\{\\}]))");
static std::regex protectedSpace { R"(~)" };
size_t lastpos = 0;
smatch sub;
@@ -1018,22 +993,12 @@ string correctRegex(string t, bool withformat)
else if (sub.str(4) == " ")
replace = " ";
else {
- if ((!withformat ||
ignoreFormats.getSpaceType()) &&
- ((sub.str(4) == ",") ||
- (sub.str(4) == ">") ||
- (sub.str(4) == "!") ||
- (sub.str(4) == ";") ||
- (sub.str(4) == ":"))) {
- replace = " ";
+ AccentsIterator it_ac =
accents.find(sub.str(4));
+ if (it_ac == accents.end()) {
+ replace = sub.str(2);
}
else {
- AccentsIterator it_ac =
accents.find(sub.str(4));
- if (it_ac == accents.end()) {
- replace = sub.str(2);
- }
- else {
- replace = it_ac->second;
- }
+ replace = it_ac->second;
}
}
}
@@ -1252,9 +1217,6 @@ static docstring buffer_to_latex(Buffer & buffer)
if (ignoreFormats.getNonContent()) {
runparams.find_add_feature(OutputParams::SearchNonOutput);
}
- if (ignoreFormats.getSpaceType()) {
- runparams.find_add_feature(OutputParams::SearchDifferSpaces);
- }
pit_type const endpit = buffer.paragraphs().size();
for (pit_type pit = 0; pit != endpit; ++pit) {
TeXOnePar(buffer, buffer.text(), pit, os, runparams, string(),
-1, -1, true);
@@ -2253,14 +2215,11 @@ static void buildAccentsMap()
accents["guillemotright"] = "»";
accents["guillemotleft"] = "«";
accents["hairspace"] = getutf8(0xf0000); // select from free
unicode plane 15
- accents["thinspace"] = getutf8(0x202f); // and used _only_ by
findadv
- accents[","] = getutf8(0x202f);
+ accents["thinspace"] = getutf8(0xf0002); // and used _only_ by
findadv
accents["negthinspace{}"]= getutf8(0xf0003); // to omit backslashed
latex macros
- accents["medspace"] = getutf8(0x2005); // See
https://en.wikipedia.org/wiki/Private_Use_Areas
- accents[":"] = getutf8(0x2005);
+ accents["medspace"] = getutf8(0xf0004); // See
https://en.wikipedia.org/wiki/Private_Use_Areas
accents["negmedspace{}"] = getutf8(0xf0005);
- accents["thickspace"] = getutf8(0x2004);
- accents[";"] = getutf8(0x2004);
+ accents["thickspace"] = getutf8(0xf0006);
accents["negthickspace{}"]= getutf8(0xf0007);
accents["lyx"] = getutf8(0xf0010); // Used logos
accents["LyX"] = getutf8(0xf0010);
@@ -4431,9 +4390,6 @@ docstring latexifyFromCursor(DocIterator const & cur, int
len)
if (ignoreFormats.getNonContent()) {
runparams.find_add_feature(OutputParams::SearchNonOutput);
}
- if (ignoreFormats.getSpaceType()) {
- runparams.find_add_feature(OutputParams::SearchDifferSpaces);
- }
if (cur.inTexted()) {
// @TODO what about searching beyond/across paragraph breaks ?
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
