Don't convert keystrokes to LaTeX accents, but insert unicode combining

characters (forgot this with the last commit)

	* src/lyxfunc.C: remove function declaration

	* src/tex-accent.C
	(lyx_accent_table): Remove obsolete stuff and add UCS4 codes
	(DoAccent): Create UCS4 combining sequences instead of LaTeX accents

	* src/tex-accent.h
	(tex_accent_struct): Remove cms member, add ucs4 member

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17669 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index e4c86cb50ba9ae1f8abda8043b90df58e203954e..5f1721ad210b0652164cb5406ec24d4313ab49d3 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -144,10 +144,6 @@ namespace Alert = frontend::Alert;
 namespace fs = boost::filesystem;
 
 
-// (alkis)
-extern tex_accent_struct get_accent(kb_action action);
-
-
 namespace {
 
 bool getLocalStatus(LCursor cursor,

diff --git a/src/tex-accent.C b/src/tex-accent.C
index 08c9444391deb64f2a9bc7ef22c5dc38c02509dc..1ddc4b741c47f79878ebbf03d9b704d38bd0f595 100644 (file)
--- a/src/tex-accent.C
+++ b/src/tex-accent.C
@@ -12,11 +12,16 @@
 #include <config.h>
 
 #include "tex-accent.h"
+#include "debug.h"
+
 #include "support/convert.h"
+#include "support/docstream.h"
 
 
 namespace lyx {
 
+// FIXME This file has nothing to do with TeX anymore
+
 /* the names used by TeX and XWindows for deadkeys/accents are not the same
    so here follows a table to clearify the differences. Please correct this
    if I got it wrong
@@ -47,26 +52,27 @@ namespace lyx {
    */
 // I am not sure how some of the XWindows names coresponds to the TeX ones.
 
-tex_accent_struct lyx_accent_table[18] = {
-       { static_cast<tex_accent>(0), "", /*"",*/ "", static_cast<kb_action>(0)},
-       {TEX_ACUTE,      "\\'",  /*" AEIOUYaeiouySZszRLCNrlcn",*/ "acute",   LFUN_ACCENT_ACUTE},
-       {TEX_GRAVE,      "\\`",  /*" aeiouAEIOU",*/           "grave",    LFUN_ACCENT_GRAVE},
-       {TEX_MACRON,     "\\=",  /*" EeAIOUaiou",*/           "macron",    LFUN_ACCENT_MACRON},
-       {TEX_TILDE,      "\\~",  /*" ANOanoIiUu",*/           "tilde",    LFUN_ACCENT_TILDE},
-       {TEX_UNDERBAR,   "\\b", /*" ",*/                     "underbar", LFUN_ACCENT_UNDERBAR},
-       {TEX_CEDILLA,    "\\c", /*" CcSsTtRLGrlgNKnk",*/     "cedilla",    LFUN_ACCENT_CEDILLA},
-       {TEX_UNDERDOT,   "\\d", /*" ",*/                     "underdot", LFUN_ACCENT_UNDERDOT},
-       {TEX_CIRCUMFLEX, "\\^",  /*" AEIOUaeiouHJhjCGScgs",*/ "circumflex",  LFUN_ACCENT_CIRCUMFLEX},
-       {TEX_CIRCLE,     "\\r", /*" AaUu",*/                 "circle",  LFUN_ACCENT_CIRCLE},
-       {TEX_TIE,        "\\t", /*" ",*/                     "tie",    LFUN_ACCENT_TIE},
-       {TEX_BREVE,      "\\u", /*" AaGgUu",*/               "breve",    LFUN_ACCENT_BREVE},
-       {TEX_CARON,      "\\v", /*" LSTZlstzCEDNRcednr",*/   "caron",    LFUN_ACCENT_CARON},
-//  {TEX_SPECIAL_CARON, "\\q", "", "ooo",  LFUN_ACCENT_SPECIAL_CARON},
-       {TEX_HUNGUML,    "\\H", /*" OUou",*/                 "hugarian_umlaut",    LFUN_ACCENT_HUNGARIAN_UMLAUT},
-       {TEX_UMLAUT,     "\\\"", /*" AEIOUaeiouy",*/          "umlaut",    LFUN_ACCENT_UMLAUT},
-       {TEX_DOT,        "\\.",  /*" ZzICGicgEe",*/           "dot",    LFUN_ACCENT_DOT},
-       {TEX_OGONEK,     "\\k",  /*" AaEe",*/                 "ogonek",    LFUN_ACCENT_OGONEK},
-       { static_cast<tex_accent>(0), "", /*"",*/ "", static_cast<kb_action>(0)}};
+tex_accent_struct lyx_accent_table[] = {
+       {TEX_NOACCENT,   0,      "",                LFUN_NOACTION},
+       {TEX_ACUTE,      0x0301, "acute",           LFUN_ACCENT_ACUTE},
+       {TEX_GRAVE,      0x0300, "grave",           LFUN_ACCENT_GRAVE},
+       {TEX_MACRON,     0x0304, "macron",          LFUN_ACCENT_MACRON},
+       {TEX_TILDE,      0x0303, "tilde",           LFUN_ACCENT_TILDE},
+       {TEX_UNDERBAR,   0x0320, "underbar",        LFUN_ACCENT_UNDERBAR},
+       {TEX_CEDILLA,    0x0327, "cedilla",         LFUN_ACCENT_CEDILLA},
+       {TEX_UNDERDOT,   0x0323, "underdot",        LFUN_ACCENT_UNDERDOT},
+       {TEX_CIRCUMFLEX, 0x0302, "circumflex",      LFUN_ACCENT_CIRCUMFLEX},
+       {TEX_CIRCLE,     0x030a, "circle",          LFUN_ACCENT_CIRCLE},
+       {TEX_TIE,        0x0361, "tie",             LFUN_ACCENT_TIE},
+       {TEX_BREVE,      0x0306, "breve",           LFUN_ACCENT_BREVE},
+       {TEX_CARON,      0x030c, "caron",           LFUN_ACCENT_CARON},
+//     {TEX_SPECIAL_CARON, 0x030c, "ooo",          LFUN_ACCENT_SPECIAL_CARON},
+       // Don't fix this typo for compatibility reasons!
+       {TEX_HUNGUML,    0x030b, "hugarian_umlaut", LFUN_ACCENT_HUNGARIAN_UMLAUT},
+       {TEX_UMLAUT,     0x0308, "umlaut",          LFUN_ACCENT_UMLAUT},
+       {TEX_DOT,        0x0307, "dot",             LFUN_ACCENT_DOT},
+       {TEX_OGONEK,     0x0328, "ogonek",          LFUN_ACCENT_OGONEK}
+};
 
 
 tex_accent_struct get_accent(kb_action action)
@@ -85,16 +91,20 @@ tex_accent_struct get_accent(kb_action action)
 
 docstring const DoAccent(docstring const & s, tex_accent accent)
 {
-       docstring res;
-
-       res += lyx_accent_table[accent].cmd;
-       res += '{';
-       if (s == "i" || s == "j") {
-               res += '\\';
+       if (s.empty())
+               return docstring(1, lyx_accent_table[accent].ucs4);
+
+       odocstringstream os;
+       os.put(s[0]);
+       os.put(lyx_accent_table[accent].ucs4);
+       if (s.length() > 1) {
+               if (accent != TEX_TIE || s.length() > 2)
+                       lyxerr << "Warning: Too many characters given for accent "
+                              << lyx_accent_table[accent].name << '.' << std::endl;
+               os << s.substr(1);
        }
-       res += s;
-       res += '}';
-       return res;
+       // FIXME: We should normalize the result to precomposed form
+       return os.str();
 }
 
 

diff --git a/src/tex-accent.h b/src/tex-accent.h
index d5b8f3058bc5f61ff6eb597d9bb06d4488fc23ad..201266075c692733c2cddaed35e470606e66cf0f 100644 (file)
--- a/src/tex-accent.h
+++ b/src/tex-accent.h
@@ -19,6 +19,8 @@
 
 namespace lyx {
 
+// FIXME This file has nothing to do with TeX anymore
+
 /* the names used by TeX and XWindows for deadkeys/accents are not the same
    so here follows a table to clearify the differences. Please correct this
    if I got it wrong
@@ -91,18 +93,11 @@ enum tex_accent {
 };
 
 
-/** the native is so we know what characters TeX can write in a decent way
- it should be up to the user if _all_ characters should be allowed to
- be accented. Lgb. */
 struct tex_accent_struct {
        ///
        tex_accent accent;
-       ///
-       char const * cmd;
-#if 0
-       ///
-       char const * native;
-#endif
+       /// UCS4 code point of this accent
+       char_type ucs4;
        ///
        char const * name;
        ///
@@ -116,7 +111,8 @@ extern tex_accent_struct lyx_accent_table[];
 extern docstring const DoAccent(docstring const &, tex_accent);
 ///
 extern docstring const DoAccent(char_type, tex_accent);
-
+///
+extern tex_accent_struct get_accent(kb_action action);
 
 } // namespace lyx