From: Richard Heck <rgheck@lyx.org>
Date: Sun, 31 Jul 2016 04:15:48 +0000 (-0400)
Subject: Fix substitution for $$Contents.
X-Git-Tag: 2.2.2~96
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f457b11fa74d8ab209f73ce666fc891f06c6802d;p=features.git

Fix substitution for $$Contents.

The second argument here is the length of the string to replace,
not the position of the final character.

(cherry picked from commit 6b97f2c0751ff79fc19ea0e11b4ef957fd71324c)
---

diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp
index cbbb88bc2b..0bf589a5d8 100644
--- a/src/insets/ExternalSupport.cpp
+++ b/src/insets/ExternalSupport.cpp
@@ -199,7 +199,7 @@ string const doSubstitution(InsetExternalParams const & params,
 
 		size_t const pos = result.find("$$Contents(\"");
 		size_t const end = result.find("\")", pos);
-		result.replace(pos, end + 2, contents);
+		result.replace(pos, end + 2- pos, contents);
 	}
 
 	return result;
diff --git a/status.22x b/status.22x
index 35acf5ee38..a4a3072df7 100644
--- a/status.22x
+++ b/status.22x
@@ -45,6 +45,8 @@ What's new
 
 - Fixed preview of external material with plaintext and DocBook.
 
+- Fixed substitution for $$Contents in external templates.
+
 
 * LYX2LYX