From: Richard Heck <rgheck@lyx.org>
Date: Thu, 7 Feb 2013 13:44:42 +0000 (-0500)
Subject: Fix really silly logic error. This should make prettyref-based
X-Git-Tag: 2.0.6~108
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5e9ea6f3157cd4f5172c55a897146f91e8765483;p=features.git

Fix really silly logic error. This should make prettyref-based
files work better when converted to refstyle.
(cherry picked from commit 1b7d812e5116a39d3319cda234c652f64bec9dd3)
---

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 9f606ff0a2..78e4fa1de4 100644
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -315,12 +315,13 @@ void InsetRef::validate(LaTeXFeatures & features) const
 		string const fcmd = to_utf8(getFormattedCmd(data, label, prefix));
 		if (buffer().params().use_refstyle) {
 			features.require("refstyle");
-			if (!prefix.empty()) {
+			if (prefix == "cha")
+				features.addPreambleSnippet("\\let\\charef=\\chapref");
+			else if (!prefix.empty()) {
 				string lcmd = "\\AtBeginDocument{\\providecommand" + 
 						fcmd + "[1]{\\ref{" + to_utf8(prefix) + ":#1}}}";
 				features.addPreambleSnippet(lcmd);
-			} else if (prefix == "cha")
-				features.addPreambleSnippet("\\let\\charef=\\chapref");
+			}
 		} else {
 			features.require("prettyref");
 			// prettyref uses "cha" for chapters, so we provide a kind of
diff --git a/status.20x b/status.20x
index 3cafc49cea..bbf4fd1398 100644
--- a/status.20x
+++ b/status.20x
@@ -102,6 +102,9 @@ What's new
 
 - Fix TeX crash involving font changes in URLs.
 
+- Properly output alias for formatted chapter references, so prettyref
+  documents work when converted tor refstyle.
+
 
 * USER INTERFACE