Changeset 27592

Timestamp:

11/16/08 22:51:18 (2 months ago)

Author:

lasgouttes

Message:

Now tex2lyx is able to set the encoding from what it reads in the preamble.

What works:
- parsing of inputenc should work
- \inputencoding is acted on in the preamble

What does not work:
- \inputencoding in the text
- all the corner cases I have not considered, and all buggy stuff in the

'what works' paragraph

- InsetLatexAccent? are still created, but I do not know when they got added
to the code.

The only notable trick in the code is that I had to disable buffering. Otherwise
the whole text was read before I had a chance to change the encoding...

Finally I remove the artificial limitation that forbid

\usepackage[opt1,opt2]{package1,package2}

Files:

• lyx-devel/trunk/src/Encoding.cpp (modified) (4 diffs)
• lyx-devel/trunk/src/tex2lyx/Makefile.am (modified) (1 diff)
• lyx-devel/trunk/src/tex2lyx/Parser.cpp (modified) (2 diffs)
• lyx-devel/trunk/src/tex2lyx/Parser.h (modified) (1 diff)
• lyx-devel/trunk/src/tex2lyx/preamble.cpp (modified) (4 diffs)
• lyx-devel/trunk/src/tex2lyx/tex2lyx.cpp (modified) (5 diffs)
• lyx-devel/trunk/src/tex2lyx/text.cpp (modified) (5 diffs)

lyx-devel/trunk/src/Encoding.cpp

@@ -514 +514 @@
-void Encodings::initUnicodeMath(Buffer const & buffer)
-{
+#ifdef TEX2LYX
+        // The code below is not needed in tex2lyx and requires additional stuff
+        (void)buffer;
+#else
-        mathcmd.clear();
-        textcmd.clear();
@@ -524 +528 @@
-        for (; it != end; ++it)
-                it->initUnicodeMath();
+#endif
-}
-
@@ -529 +534 @@
-void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
-{
+#ifdef TEX2LYX
+        // The code below is not needed in tex2lyx and requires additional stuff
+        (void)c;
+        (void)features;
+        (void)for_mathed;
+#else
-        CharInfoMap::const_iterator const it = unicodesymbols.find(c);
-        if (it != unicodesymbols.end()) {
@@ -567 +578 @@
-                features.require("lyxmathsym");
-        }
+#endif
-}
-

lyx-devel/trunk/src/tex2lyx/Makefile.am

@@ -42 +42 @@
-        ../lengthcommon.cpp \
-        ../Color.cpp \
-
+
+
-
-BUILT_SOURCES = $(PCH_FILE)

lyx-devel/trunk/src/tex2lyx/Parser.cpp

@@ -11 +11 @@
-#include <config.h>
-
+#include "Encoding.h"
-#include "Parser.h"
-
@@ -147 +148 @@
-{
-        delete iss_;
+}
+
+
+void Parser::setEncoding(std::string const & e)
+{
+        Encoding const * enc = encodings.fromLaTeXName(e);
+        cerr << "setting encoding to " << enc->iconvName();
+        is_ << lyx::setEncoding(enc->iconvName());
-}
-

lyx-devel/trunk/src/tex2lyx/Parser.h

@@ -120 +120 @@
-        ~Parser();
-
+        /// change the encoding of the input stream
+        void setEncoding(std::string const & encoding);
+
-        ///
-        int lineno() const { return lineno_; }

lyx-devel/trunk/src/tex2lyx/preamble.cpp

@@ -249 +249 @@
-
-
-
+Parser &p, 
-                    bool in_lyx_preamble)
-{
@@ -327 +327 @@
-
-        else if (name == "inputenc") {
-
-
-
+
+
+
+
-                if (opts.find(",") == string::npos && one_language == true) {
-                        if (opts == "ascii")
@@ -338 +339 @@
-                                h_inputencoding = opts;
-                }
+                if (!options.empty())
+                        p.setEncoding(options.back());
-                options.clear();
-        }
@@ -664 +667 @@
-                        string const options = p.getArg('[', ']');
-                        string const name = p.getArg('{', '}');
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                }
-
-                else if (t.cs() == "inputencoding") {
-
+
+
+
-                }
-

lyx-devel/trunk/src/tex2lyx/tex2lyx.cpp

@@ -16 +16 @@
-
-#include "Context.h"
+#include "Encoding.h"
+#include "Layout.h"
-#include "TextClass.h"
-#include "Layout.h"
-
-#include "support/convert.h"
@@ -422 +423 @@
-bool tex2lyx(FileName const & infilename, ostream & os)
-{
-
+
+
+
+
-        if (!is.good()) {
-                cerr << "Could not open input file \"" << infilename
@@ -488 +492 @@
-        try {
-                init_package(internal_path(to_utf8(from_local8bit(argv[0]))),
-
-
+            
+            
-        } catch (ExceptionMessage const & message) {
-                cerr << to_utf8(message.title_) << ":\n"
-       
+     
-                if (message.type_ == ErrorException)
-                        exit(1);
@@ -510 +514 @@
-                outfilename = changeExtension(infilename, ".lyx");
-
+        // Read the syntax tables
-        FileName const system_syntaxfile = libFileSearch("", "syntax.default");
-        if (system_syntaxfile.empty()) {
@@ -519 +524 @@
-                read_syntaxfile(makeAbsPath(syntaxfile));
-
+        // Read the encodings table.
+        FileName const symbols_path = libFileSearch(string(), "unicodesymbols");
+        if (symbols_path.empty()) {
+                cerr << "Error: Could not find file \"unicodesymbols\"." 
+                     << endl;
+                exit(1);
+        }
+        FileName const enc_path = libFileSearch(string(), "encodings");
+        if (enc_path.empty()) {
+                cerr << "Error: Could not find file \"encodings\"." 
+                     << endl;
+                exit(1);
+        }
+        encodings.read(enc_path, symbols_path);
+
+        // The real work now.
-        masterFilePath = onlyPath(infilename);
-        parentFilePath = masterFilePath;
-
-        if (outfilename == "-") {
-                if (tex2lyx(FileName(infilename), cout))

lyx-devel/trunk/src/tex2lyx/text.cpp

@@ -1764 +1764 @@
-                        context.check_layout(os);
-                        string const s = p.verbatim_item();
+                        //FIXME: this never triggers in UTF8
-                        if (s == "\xb1" || s == "\xb3" || s == "\xb2" || s == "\xb5")
-                                os << s;
@@ -2239 +2240 @@
-                }
-
+#if 0
+//FIXME: rewrite this
-                else if (t.cs() == "\"") {
-                        context.check_layout(os);
@@ -2250 +2253 @@
-                        else handle_ert(os, "\"{" + name + "}", context);
-                }
+#endif
-
-                // Problem: \= creates a tabstop inside the tabbing environment
@@ -2274 +2278 @@
-                }
-
+#if 0
+//FIXME: rewrite this
-                else if (t.cs() == "ss") {
-                        context.check_layout(os);
@@ -2279 +2285 @@
-                        skip_braces(p); // eat {}
-                }
+#endif
-
-                else if (t.cs() == "i" || t.cs() == "j" || t.cs() == "l" ||