Enable InsetQuote in verbatim and Hebrew

[lyx.git] / src / insets / InsetRef.cpp

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index a2466c8ac10753ab6a2a96498b5129c3ba85a9e1..8cb8c58027f22d8877a8040fcf1d7b98f912f4ba 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -23,6 +23,7 @@
 #include "output_xhtml.h"
 #include "ParIterator.h"
 #include "sgml.h"
+#include "texstream.h"
 #include "TocBackend.h"
 
 #include "support/debug.h"
@@ -322,14 +323,14 @@ void InsetRef::validate(LaTeXFeatures & features) const
                docstring const data = getEscapedLabel(features.runparams());
                docstring label;
                docstring prefix;
-               string const fcmd = to_utf8(getFormattedCmd(data, label, prefix));
+               docstring const fcmd = getFormattedCmd(data, label, prefix);
                if (buffer().params().use_refstyle) {
                        features.require("refstyle");
                        if (prefix == "cha")
-                               features.addPreambleSnippet("\\let\\charef=\\chapref");
+                               features.addPreambleSnippet(from_ascii("\\let\\charef=\\chapref"));
                        else if (!prefix.empty()) {
-                               string lcmd = "\\AtBeginDocument{\\providecommand" + 
-                                               fcmd + "[1]{\\ref{" + to_utf8(prefix) + ":#1}}}";
+                               docstring lcmd = "\\AtBeginDocument{\\providecommand" +
+                                               fcmd + "[1]{\\ref{" + prefix + ":#1}}}";
                                features.addPreambleSnippet(lcmd);
                        }
                } else {
@@ -337,7 +338,7 @@ void InsetRef::validate(LaTeXFeatures & features) const
                        // prettyref uses "cha" for chapters, so we provide a kind of
                        // translation.
                        if (prefix == "chap")
-                               features.addPreambleSnippet("\\let\\pr@chap=\\pr@cha");
+                               features.addPreambleSnippet(from_ascii("\\let\\pr@chap=\\pr@cha"));
                }
        } else if (cmd == "eqref" && !buffer().params().use_refstyle)
                // with refstyle, we simply output "(\ref{label})"
@@ -354,7 +355,7 @@ InsetRef::type_info const InsetRef::types[] = {
        { "vpageref",  N_("Textual Page Number"),   N_("TextPage: ")},
        { "vref",      N_("Standard+Textual Page"), N_("Ref+Text: ")},
        { "formatted", N_("Formatted"),             N_("Format: ")},
-       { "nameref",   N_("Reference to Name"),     N_("NameRef:")},
+       { "nameref",   N_("Reference to Name"),     N_("NameRef: ")},
        { "", "", "" }
 };