Merge branch '2.4.x' into 2.4.1-devel

README

@@ -42,7 +42,7 @@ How does the LyX version scheme work?
     number "2.x.y" indicates a stable release '2.x', maintenance
     release 'y'.  In other words, LyX 2.3.0 was the first stable
     release in the 2.3-series of LyX. At the time of writing, the
-    latest maintenance release in the 2.3-series is LyX 2.3.7.
+    latest maintenance release in the 2.3-series is LyX 2.3.8.
 
     Please note that maintenance releases are designed primarily to
     fix bugs, and that the file format will _never_ change due to a
@@ -56,8 +56,8 @@ How does the LyX version scheme work?
     series. To summarize, there are three possible types of file names
     that are of interest to normal users:
 
-       lyx-2.3.0.tar.gz     -- stable release, first in the 2.3-series
-       lyx-2.2.4.tar.gz     -- fourth maintenance release of LyX 2.2
+       lyx-2.4.0.tar.gz     -- stable release, first in the 2.4-series
+       lyx-2.3.4.tar.gz     -- fourth maintenance release of LyX 2.3
        lyx-2.4.0rc1.tar.gz  -- potentially unstable release candidate
 
     Note that the goal is not parallel development as for the Linux
@@ -71,10 +71,10 @@ How does the LyX version scheme work?
     If you get the source from Git, the version string will look like
     one of:
 
-       2.3.1dev     -- this is the stable branch on which maintenance
-               release 2.3.1 will eventually be tagged.
-       2.4.0dev     -- this is the main branch on which stable
-               release 2.4.0 will eventually be tagged.
+       2.4.1dev     -- this is the stable branch on which maintenance
+               release 2.4.1 will eventually be tagged.
+       2.5.0dev     -- this is the main branch on which stable
+               release 2.5.0 will eventually be tagged.
 
 What's new?
 

po/lyx_pot.py

@@ -604,7 +604,7 @@ def encodings_l10n(input_files, output, base):
     output = io.open(output, 'w', encoding='utf_8', newline='\n')
     # assuming only one encodings file
     #                 Encoding utf8      utf8    "Unicode (utf8)" UTF-8    variable inputenc
-    reg = re.compile('Encoding [\w-]+\s+[\w-]+\s+"([\w \-\(\)\[\]\/^"]*)"\s+["\w-]+\s+(fixed|variable|variableunsafe)\s+\w+.*')
+    reg = re.compile(r'Encoding [\w-]+\s+[\w-]+\s+"([\w \-\(\)\[\]\/^"]*)"\s+["\w-]+\s+(fixed|variable|variableunsafe)\s+\w+.*')
     input = io.open(input_files[0], encoding='utf_8')
     for lineno, line in enumerate(input.readlines()):
         if not line.startswith('Encoding'):

src/RowPainter.cpp

@@ -313,8 +313,8 @@ void RowPainter::paintAppendix() const
 	if (par_.params().startOfAppendix())
 		y += 2 * defaultRowHeight();
 
-	pi_.pain.line(1, y, 1, yo_ + row_.height(), Color_appendix);
-	pi_.pain.line(tm_.width() - 2, y, tm_.width() - 2, yo_ + row_.height(), Color_appendix);
+	pi_.pain.line(1, y, 1, yo_ + row_.descent(), Color_appendix);
+	pi_.pain.line(tm_.width() - 2, y, tm_.width() - 2, yo_ + row_.descent(), Color_appendix);
 }
 
 

src/TextClass.cpp

@@ -693,7 +693,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
 			string const pkg = lexrc.getString();
 			lexrc.eatLine();
 			string const options = lexrc.getString();
-			package_options_[pkg] = options;
+			package_options_[pkg] = trim(options, "\"");
 			break;
 		}
 

src/insets/InsetLayout.h

@@ -200,7 +200,7 @@ public:
 	///
 	bool docbookrenderasimage() const { return docbookrenderasimage_; }
 	///
-	std::set<std::string> required() const & { return required_; }
+	std::set<std::string> const & required() const { return required_; }
 	///
 	bool isMultiPar() const { return multipar_; }
 	///

status.24x

@@ -96,6 +96,9 @@ What's new
 - Put new citation after selected item rather than at end of list (bug 12940).
 
 
+- fix overflow of appendix red frame in document-bottom grey area.
+
+
 * INTERNALS
 
 - Fix case where insets do not have proper information about current buffer
@@ -107,6 +110,8 @@ What's new
 
 - Fix "Unassigned buffer_" error with math references (bug 12947).
 
+- Re-allow the use of quoted argument to PackageOptions layout tag.
+
 
 * DOCUMENTATION AND LOCALIZATION