} // namespace anon
+EncodingException::EncodingException(char_type c)
+ : failed_char(c), par_id(0), pos(0)
+{
+}
+
+
+const char * EncodingException::what() const throw()
+{
+ return "Could not find LaTeX command for a character";
+}
+
+
Encoding::Encoding(string const & n, string const & l, string const & i,
bool f, Encoding::Package p)
- : Name_(n), LatexName_(l), iconvName_(i), fixedwidth_(f), package_(p)
+ : name_(n), latexName_(l), iconvName_(i), fixedwidth_(f), package_(p)
{
if (n == "ascii") {
// ASCII can encode 128 code points and nothing else
void Encoding::init() const
{
+ if (complete_)
+ return;
+
start_encodable_ = 0;
// temporarily switch off lyxerr, since we will generate iconv errors
lyxerr.disable();
for (unsigned short j = 0; j < 256; ++j) {
char const c = char(j);
vector<char_type> const ucs4 = eightbit_to_ucs4(&c, 1, iconvName_);
- if (ucs4.size() == 1) {
- char_type const c = ucs4[0];
- CharInfoMap::const_iterator const it = unicodesymbols.find(c);
- if (it == unicodesymbols.end() || !it->second.force)
- encodable_.insert(c);
- }
+ if (ucs4.size() != 1)
+ continue;
+ char_type const uc = ucs4[0];
+ CharInfoMap::const_iterator const it = unicodesymbols.find(uc);
+ if (it == unicodesymbols.end() || !it->second.force)
+ encodable_.insert(uc);
}
} else {
// We do not know how many code points this encoding has, and
}
-docstring const Encoding::latexChar(char_type c) const
+docstring Encoding::latexChar(char_type c) const
{
// assure the used encoding is properly initialized
- if (!complete_)
- init();
- BOOST_ASSERT(complete_);
+ init();
if (c < start_encodable_)
return docstring(1, c);
- if (encodable_.find(c) == encodable_.end()) {
- // c cannot be encoded in this encoding
- CharInfoMap::const_iterator const it = unicodesymbols.find(c);
- if (it == unicodesymbols.end())
- lyxerr << "Could not find LaTeX command for character 0x"
- << hex << c << dec
- << ".\nLaTeX export will fail."
- << endl;
- else
- return it->second.command;
- }
- return docstring(1, c);
+ if (encodable_.find(c) != encodable_.end())
+ return docstring(1, c);
+
+ // c cannot be encoded in this encoding
+ CharInfoMap::const_iterator const it = unicodesymbols.find(c);
+ if (it == unicodesymbols.end())
+ throw EncodingException(c);
+ return it->second.command;
+}
+
+
+vector<char_type> Encoding::symbolsList() const
+{
+ // assure the used encoding is properly initialized
+ init();
+
+ // first all encodable characters
+ vector<char_type> symbols(encodable_.begin(), encodable_.end());
+ // add those below start_encodable_
+ for (char_type c = 0; c < start_encodable_; ++c)
+ symbols.push_back(c);
+ // now the ones from the unicodesymbols file
+ CharInfoMap::const_iterator const end = unicodesymbols.end();
+ CharInfoMap::const_iterator it = unicodesymbols.begin();
+ for (; it != end; ++it)
+ symbols.push_back(it->first);
+ return symbols;
}
}
-bool Encodings::isComposeChar_hebrew(char_type c)
+bool Encodings::isHebrewComposeChar(char_type c)
{
- return c <= 0x05c2 && c >= 0x05b0 &&
- c != 0x05be && c != 0x05c0;
+ return c <= 0x05c2 && c >= 0x05b0 && c != 0x05be && c != 0x05c0;
}
// they are hamza, alef_madda, alef_hamza, waw_hamza, alef_hamza_under,
// alef, tah_marbota, dal, thal, rah, zai, wow, alef_maksoura
-bool Encodings::is_arabic_special(char_type c)
+bool Encodings::isArabicSpecialChar(char_type c)
{
- return (c >= 0x0621 && c <= 0x0625) ||
- c == 0x0627 || c == 0x0629 ||
- c == 0x062f || c == 0x0648 ||
- (c >= 0x0630 && c <= 0x0632) ||
- c == 0x0649 || c == 0x0698;
+ return (c >= 0x0621 && c <= 0x0625) || (c >= 0x0630 && c <= 0x0632)
+ || c == 0x0627 || c == 0x0629 || c == 0x062f || c == 0x0648
+ || c == 0x0649 || c == 0x0698;
}
-bool Encodings::isComposeChar_arabic(char_type c)
+bool Encodings::isArabicComposeChar(char_type c)
{
return c >= 0x064b && c <= 0x0652;
}
-bool Encodings::is_arabic(char_type c)
+bool Encodings::isArabicChar(char_type c)
{
- return c >= arabic_start && c <= arabic_end &&
- arabic_table[c-arabic_start][0];
+ return c >= arabic_start && c <= arabic_end
+ && arabic_table[c-arabic_start][0];
}
-char_type Encodings::transformChar(char_type c,
- Encodings::Letter_Form form)
+char_type Encodings::transformChar(char_type c, Encodings::LetterForm form)
{
- if (!is_arabic(c))
- return c;
-
- return arabic_table[c-arabic_start][form];
+ return isArabicChar(c) ? arabic_table[c-arabic_start][form] : c;
}
if (it == unicodesymbols.end())
return false;
- if (it->second.preamble != "textgreek" &&
- it->second.preamble != "textcyr")
+ if (it->second.preamble != "textgreek" && it->second.preamble != "textcyr")
return false;
if (preamble.empty()) {
}
-Encoding const * Encodings::getFromLyXName(string const & name) const
+Encoding const * Encodings::fromLyXName(string const & name) const
{
- EncodingList::const_iterator it = encodinglist.find(name);
- if (it != encodinglist.end())
- return &it->second;
- else
- return 0;
+ EncodingList::const_iterator const it = encodinglist.find(name);
+ return it != encodinglist.end() ? &it->second : 0;
}
-Encoding const * Encodings::getFromLaTeXName(string const & name) const
+Encoding const * Encodings::fromLaTeXName(string const & name) const
{
// We don't use find_if because it makes copies of the pairs in
// the map.
CharInfo info;
string flags;
- if (symbolslex.next(true)) {
- istringstream is(symbolslex.getString());
- // reading symbol directly does not work if
- // char_type == wchar_t.
- boost::uint32_t tmp;
- if(!(is >> hex >> tmp))
- break;
- symbol = tmp;
- } else
+ if (!symbolslex.next(true))
break;
- if (symbolslex.next(true))
- info.command = symbolslex.getDocString();
- else
+
+ istringstream is(symbolslex.getString());
+ // reading symbol directly does not work if
+ // char_type == wchar_t.
+ boost::uint32_t tmp;
+ if(!(is >> hex >> tmp))
break;
- if (symbolslex.next(true))
- info.preamble = symbolslex.getString();
- else
+ symbol = tmp;
+
+ if (!symbolslex.next(true))
break;
- if (symbolslex.next(true))
- flags = symbolslex.getString();
- else
+ info.command = symbolslex.getDocString();
+ if (!symbolslex.next(true))
break;
+ info.preamble = symbolslex.getString();
+ if (!symbolslex.next(true))
+ break;
+ flags = symbolslex.getString();
info.combining = false;
info.feature = false;
info.force = false;
while (!flags.empty()) {
string flag;
- flags = support::split(flags, flag, ',');
+ flags = split(flags, flag, ',');
if (flag == "combining")
info.combining = true;
else if (flag == "force")
fixedwidth = true;
else if (width == "variable")
fixedwidth = false;
- else {
+ else
lex.printError("Encodings::read: "
"Unknown width: `$$Token'");
- }
-
+
lex.next();
string const p = lex.getString();
Encoding::Package package = Encoding::none;
package = Encoding::inputenc;
else if (p == "CJK")
package = Encoding::CJK;
- else {
+ else
lex.printError("Encodings::read: "
"Unknown package: `$$Token'");
- }
-
+
LYXERR(Debug::INFO, "Reading encoding " << name);
encodinglist[name] = Encoding(name, latexname,
- iconvname, fixedwidth,
- package);
+ iconvname, fixedwidth, package);
+
if (lex.lex() != et_end)
lex.printError("Encodings::read: "
"missing end");
projects / lyx.git / blobdiff