anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-05 13:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix reading UTF8 encoded symbol file

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15472 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2006-10-22 12:07:01 +00:00
parent 21e8d10d97
commit 578baa8f98
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mathed/MathMacroTable.C
View File

@ -78,14 +78,6 @@ MacroTable & MacroTable::globalMacros()
}
// The local table.
//MacroTable & MacroTable::localMacros()
//{
// static MacroTable theLocalMacros;
// return theLocalMacros;
//}
bool MacroTable::has(docstring const & name) const
{
return find(name) != end();
@ -102,14 +94,14 @@ MacroData const & MacroTable::get(docstring const & name) const
void MacroTable::insert(docstring const & name, MacroData const & data)
{
//lyxerr << "MacroTable::insert: " << name << endl;
//lyxerr << "MacroTable::insert: " << to_utf8(name) << endl;
operator[](name) = data;
}
void MacroTable::insert(docstring const & def)
{
//lyxerr << "MacroTable::insert, def: " << def << endl;
//lyxerr << "MacroTable::insert, def: " << to_utf8(def) << endl;
std::istringstream is(to_utf8(def));
MathMacroTemplate mac(is);
insert(mac.name(), mac.asMacroData());

2
src/mathed/MathMacroTemplate.C
View File

@ -80,7 +80,7 @@ auto_ptr<InsetBase> MathMacroTemplate::doClone() const
void MathMacroTemplate::edit(LCursor & cur, bool)
{
lyxerr << "MathMacroTemplate: edit left/right" << endl;
//lyxerr << "MathMacroTemplate: edit left/right" << endl;
cur.push(*this);
}

12
src/mathed/MathParser.C
View File

@ -325,7 +325,7 @@ private:
///
void tokenize(docstring const & s);
///
void skipSpaceTokens(istream & is, char c);
void skipSpaceTokens(idocstream & is, char_type c);
///
void push_back(Token const & t);
///
@ -451,7 +451,7 @@ docstring Parser::getArg(char_type left, char_type right)
}
void Parser::skipSpaceTokens(istream & is, char c)
void Parser::skipSpaceTokens(idocstream & is, char_type c)
{
// skip trailing spaces
while (catcode(c) == catSpace || catcode(c) == catNewline)
@ -466,7 +466,7 @@ void Parser::tokenize(istream & is)
{
// eat everything up to the next \end_inset or end of stream
// and store it in s for further tokenization
docstring s;
std::string s;
char c;
while (is.get(c)) {
s += c;
@ -480,15 +480,15 @@ void Parser::tokenize(istream & is)
is.unget();
// tokenize buffer
tokenize(s);
tokenize(from_utf8(s));
}
void Parser::tokenize(docstring const & buffer)
{
istringstream is(to_utf8(buffer), ios::in | ios::binary);
idocstringstream is(buffer, ios::in | ios::binary);
char c;
char_type c;
while (is.get(c)) {
//lyxerr << "reading c: " << c << endl;