Introduce "inherit" encoding for latex_language

This gets rid of the hardcoded latin1 encoding for verbatim. Instead,
verbatim now inherits the encoding from the context, which is what is
actually wanted here.

Fixes: #9012, #9258

diff --git a/lib/encodings b/lib/encodings
index 924c996b967117cbaa2979c142237888fc3a1770..c43f63802863a0a600b1489870f30d91f0aa0775 100644 (file)
--- a/lib/encodings
+++ b/lib/encodings
@@ -246,3 +246,9 @@ End
 # Pure 7bit ASCII encoding (partially hardcoded in LyX)
 Encoding ascii ascii "ASCII" ascii fixed none
 End
+
+# Semantic encodings
+
+# Inherit encoding of the context (used by verbatim)
+Encoding inherit inherit "" "" fixed none
+End

diff --git a/lib/languages b/lib/languages
index 282d902c78adcb4953794ec6e5595d9f1e6fe289..4c3b49b2ac3b40534c8fd5d779b7daed84262381 100644 (file)
--- a/lib/languages
+++ b/lib/languages
@@ -65,6 +65,8 @@
 # * Encoding is the default encoding used with TeX fonts.
 #   It is only used if Document > Settings > Language > Encoding
 #   is set to "Language Default" and "use non-TeX fonts" is FALSE.
+#   Encoding "inherit" means: keep encoding of the context (used by
+#   latex_language).
 # * InternalEncoding is used to tell LyX that babel internally sets a
 #   non-standard font encoding (such as hebrew to LHE or greek to LGR).
 #   If True, LyX cares for characters/macros that do not exist in
@@ -100,13 +102,13 @@ Language ignore
        GuiName          "Ignore"
        BabelName        ignore
        PolyglossiaName  ignore
-       Encoding         iso8859-1
+       Encoding         inherit
        LangCode         ignore
 End
 
 Language latex
        GuiName          "LaTeX"
-       Encoding         iso8859-1
+       Encoding         inherit
        LangCode         latex
 End
 

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 997f5d5535217dba5dc9a03e273e5ed6e1b8dfe1..2e8060509de0dbfd40af8033640bfc971463314e 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -21,7 +21,6 @@
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
-#include "Encoding.h"
 #include "Font.h"
 #include "FuncCode.h"
 #include "FuncRequest.h"
@@ -2138,22 +2137,6 @@ docstring Cursor::getPossibleLabel() const
 }
 
 
-Encoding const * Cursor::getEncoding() const
-{
-       if (empty())
-               return 0;
-       BufferParams const & bp = bv().buffer().params();
-       if (bp.useNonTeXFonts)
-               return encodings.fromLyXName("utf8-plain");
-
-       CursorSlice const & sl = innerTextSlice();
-       Text const & text = *sl.text();
-       Font font = text.getPar(sl.pit()).getFont(bp, sl.pos(),
-                                                 text.outerFont(sl.pit()));
-       return font.language()->encoding();
-}
-
-
 void Cursor::undispatched() const
 {
        disp_.dispatched(false);

diff --git a/src/Cursor.h b/src/Cursor.h
index 5c675c493ac7413e6458abca9f577c7806c406fd..8a8c71996d52a959b4cae283a5bf8014cd9a814d 100644 (file)
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -72,7 +72,6 @@ class Row;
 
 // these should go
 class InsetMathUnknown;
-class Encoding;
 
 /**
  * This class describes the position of a cursor within a document,
@@ -546,8 +545,6 @@ public:
        int macroNamePos();
        /// can we enter the inset?
        bool openable(MathAtom const &) const;
-       ///
-       Encoding const * getEncoding() const;
        /// font at cursor position
        Font getFont() const;
 };

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 38f2393224b1e37b1839537f12ea6b85008ec8d8..2c0d920db16893964195c3418e02062e5018a57f 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -15,7 +15,11 @@
 #include "DocIterator.h"
 
 #include "Buffer.h"
+#include "BufferParams.h"
+#include "Encoding.h"
+#include "Font.h"
 #include "InsetList.h"
+#include "Language.h"
 #include "Paragraph.h"
 #include "LyXRC.h"
 #include "Text.h"
@@ -688,6 +692,33 @@ void DocIterator::append(DocIterator::idx_type idx, pos_type pos)
 }
 
 
+Encoding const * DocIterator::getEncoding() const
+{
+       if (empty())
+               return 0;
+       BufferParams const & bp = buffer()->params();
+       if (bp.useNonTeXFonts)
+               return encodings.fromLyXName("utf8-plain");
+
+       CursorSlice const & sl = innerTextSlice();
+       Text const & text = *sl.text();
+       Font font = text.getPar(sl.pit()).getFont(bp, sl.pos(),
+                                                 text.outerFont(sl.pit()));
+       Encoding const * enc = font.language()->encoding();
+       if (enc->name() == "inherit") {
+               size_t const n = depth();
+               for (size_t i = 0; i < n; ++i) {
+                       Text const & otext = *slices_[i].text();
+                       Font ofont = otext.getPar(slices_[i].pit()).getFont(bp, slices_[i].pos(),
+                                                                 otext.outerFont(slices_[i].pit()));
+                       if (ofont.language()->encoding()->name() != "inherit")
+                               return ofont.language()->encoding();
+               }
+       }
+       return font.language()->encoding();
+}
+
+
 ostream & operator<<(ostream & os, DocIterator const & dit)
 {
        for (size_t i = 0, n = dit.depth(); i != n; ++i)

diff --git a/src/DocIterator.h b/src/DocIterator.h
index 4aff05cd0b62e43a5cd27bb4a241f7d5bdfcd568..cd9ce0f0b4c82fbc8e1f1ad426c4f55e59721747 100644 (file)
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -20,6 +20,7 @@
 namespace lyx {
 
 class DocIterator;
+class Encoding;
 class LyXErr;
 class MathAtom;
 class Paragraph;
@@ -257,6 +258,9 @@ public:
        /// push one CursorSlice on top and set its index and position
        void append(idx_type idx, pos_type pos);
 
+       ///
+       Encoding const * getEncoding() const;
+
 private:
        friend class InsetIterator;
        friend DocIterator doc_iterator_begin(Buffer const * buf, Inset const * inset);

diff --git a/src/Text.cpp b/src/Text.cpp
index e1c37faf3ab2700376d70f2d2f2e0ca2b4e3fc8a..d5d729a2770935d2722d756ef0438594cf9c3b15 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -933,15 +933,12 @@ bool canInsertChar(Cursor const & cur, char_type c)
                }
        }
 
-       // Prevent to insert uncodable characters in verbatim and ERT
-       // (workaround for bug 9012)
-       // Don't do it for listings inset, since InsetListings::latex() tries
-       // to switch to a usable encoding which works in many cases (bug 9102).
-       if (par.isPassThru() && cur.inset().lyxCode() != LISTINGS_CODE &&
-           cur.current_font.language()) {
-               Encoding const * e = cur.current_font.language()->encoding();
+       // Prevent to insert uncodable characters in verbatim and ERT.
+       // The encoding is inherited from the context here.
+       if (par.isPassThru() && cur.getEncoding()) {
+               Encoding const * e = cur.getEncoding();
                if (!e->encodable(c)) {
-                       cur.message(_("Character is uncodable in verbatim paragraphs."));
+                       cur.message(_("Character is uncodable in this verbatim context."));
                        return false;
                }
        }

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index cea4e78d2f7af1a0802fdfab4fd1afe228fa14fa..784b0933b5c35753090fbea5bebf08c89b6c062d 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1076,11 +1076,10 @@ GuiDocument::GuiDocument(GuiView & lv)
        // Always put the default encoding in the first position.
        langModule->encodingCO->addItem(qt_("Language Default (no inputenc)"));
        QStringList encodinglist;
-       Encodings::const_iterator it = encodings.begin();
-       Encodings::const_iterator const end = encodings.end();
-       for (; it != end; ++it)
-               if (!it->unsafe())
-                       encodinglist.append(qt_(it->guiName()));
+       for (auto const & encvar : encodings) {
+               if (!encvar.unsafe() && !encvar.guiName().empty())
+                       encodinglist.append(qt_(encvar.guiName()));
+       }
        encodinglist.sort();
        langModule->encodingCO->addItems(encodinglist);
 

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 1431bbb321254fa7e32da97211f3806401b09196..0ee9af100316836976f16612dbec82a064c58917 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1488,7 +1488,7 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
        // * with useNonTeXFonts: "utf8plain",
        // * with XeTeX and TeX fonts: "ascii" (inputenc fails),
        // * with LuaTeX and TeX fonts: only one encoding accepted by luainputenc.
-       if (runparams.isFullUnicode())
+       if (runparams.isFullUnicode() || newEnc.name() == "inherit")
                return make_pair(false, 0);
 
        Encoding const & oldEnc = *runparams.encoding;