2003-08-23 00:17:00 +00:00
|
|
|
/**
|
2007-04-26 04:41:58 +00:00
|
|
|
* \file Encoding.cpp
|
2003-08-23 00:17:00 +00:00
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
2002-03-21 17:27:08 +00:00
|
|
|
*
|
2008-11-14 15:58:50 +00:00
|
|
|
* \author Lars Gullik Bjønnes
|
2003-08-23 00:17:00 +00:00
|
|
|
* \author Jean-Marc Lasgouttes
|
|
|
|
* \author Dekel Tsur
|
2002-03-21 17:27:08 +00:00
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
*/
|
2000-07-04 20:32:37 +00:00
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "Encoding.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
2007-04-26 11:30:54 +00:00
|
|
|
#include "Lexer.h"
|
2000-10-10 12:36:36 +00:00
|
|
|
|
2007-11-29 07:04:28 +00:00
|
|
|
#include "support/debug.h"
|
2012-06-30 11:30:48 +00:00
|
|
|
#include "support/gettext.h"
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
#include "support/lstrings.h"
|
2014-12-08 21:25:40 +00:00
|
|
|
#include "support/mutex.h"
|
2008-12-22 15:23:05 +00:00
|
|
|
#include "support/textutils.h"
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
#include "support/unicode.h"
|
2006-11-26 21:30:39 +00:00
|
|
|
|
2007-10-31 22:40:34 +00:00
|
|
|
#include <boost/cstdint.hpp>
|
|
|
|
|
2016-12-08 15:27:45 +00:00
|
|
|
#include <iterator>
|
2014-06-07 06:17:20 +00:00
|
|
|
#include <algorithm>
|
2016-12-08 15:27:45 +00:00
|
|
|
#include <sstream>
|
2007-01-29 08:49:01 +00:00
|
|
|
|
2007-12-12 10:16:00 +00:00
|
|
|
using namespace std;
|
2007-12-12 18:57:56 +00:00
|
|
|
using namespace lyx::support;
|
2000-10-10 12:36:36 +00:00
|
|
|
|
2007-07-17 17:46:54 +00:00
|
|
|
namespace lyx {
|
|
|
|
|
2013-01-26 05:10:44 +00:00
|
|
|
int const Encoding::any = -1;
|
|
|
|
|
2000-10-10 12:36:36 +00:00
|
|
|
Encodings encodings;
|
2000-07-04 20:32:37 +00:00
|
|
|
|
2008-09-25 18:38:25 +00:00
|
|
|
Encodings::MathCommandSet Encodings::mathcmd;
|
|
|
|
Encodings::TextCommandSet Encodings::textcmd;
|
|
|
|
Encodings::MathSymbolSet Encodings::mathsym;
|
|
|
|
|
2001-03-20 01:22:46 +00:00
|
|
|
namespace {
|
|
|
|
|
2007-12-12 19:28:07 +00:00
|
|
|
typedef map<char_type, CharInfo> CharInfoMap;
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
CharInfoMap unicodesymbols;
|
|
|
|
|
2013-09-26 20:22:40 +00:00
|
|
|
typedef set<char_type> CharSet;
|
|
|
|
typedef map<string, CharSet> CharSetMap;
|
2008-06-23 18:00:43 +00:00
|
|
|
CharSet forced;
|
2013-01-12 18:25:24 +00:00
|
|
|
CharSetMap forcedselected;
|
2008-06-23 18:00:43 +00:00
|
|
|
|
2013-09-26 20:22:40 +00:00
|
|
|
typedef set<char_type> MathAlphaSet;
|
2008-09-26 15:53:15 +00:00
|
|
|
MathAlphaSet mathalpha;
|
|
|
|
|
2007-05-06 20:26:02 +00:00
|
|
|
|
|
|
|
/// The highest code point in UCS4 encoding (1<<20 + 1<<16)
|
|
|
|
char_type const max_ucs4 = 0x110000;
|
|
|
|
|
2017-07-23 11:11:54 +00:00
|
|
|
} // namespace
|
2001-03-20 01:22:46 +00:00
|
|
|
|
|
|
|
|
2007-12-18 17:51:20 +00:00
|
|
|
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";
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-29 13:07:22 +00:00
|
|
|
CharInfo::CharInfo(
|
2014-07-05 17:13:10 +00:00
|
|
|
docstring const & textcommand, docstring const & mathcommand,
|
|
|
|
std::string const & textpreamble, std::string const & mathpreamble,
|
|
|
|
std::string const & tipashortcut, unsigned int flags)
|
2013-09-29 13:07:22 +00:00
|
|
|
: textcommand_(textcommand), mathcommand_(mathcommand),
|
|
|
|
textpreamble_(textpreamble), mathpreamble_(mathpreamble),
|
|
|
|
tipashortcut_(tipashortcut), flags_(flags)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-12-07 16:29:12 +00:00
|
|
|
|
2008-07-11 08:56:17 +00:00
|
|
|
Encoding::Encoding(string const & n, string const & l, string const & g,
|
2012-12-30 19:39:33 +00:00
|
|
|
string const & i, bool f, bool u, Encoding::Package p)
|
|
|
|
: name_(n), latexName_(l), guiName_(g), iconvName_(i), fixedwidth_(f),
|
2013-01-12 18:25:24 +00:00
|
|
|
unsafe_(u), forced_(&forcedselected[n]), package_(p)
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
{
|
2007-05-06 20:26:02 +00:00
|
|
|
if (n == "ascii") {
|
2007-02-16 18:29:48 +00:00
|
|
|
// ASCII can encode 128 code points and nothing else
|
|
|
|
start_encodable_ = 128;
|
2007-05-06 20:26:02 +00:00
|
|
|
complete_ = true;
|
|
|
|
} else if (i == "UTF-8") {
|
|
|
|
// UTF8 can encode all UCS4 code points
|
|
|
|
start_encodable_ = max_ucs4;
|
|
|
|
complete_ = true;
|
|
|
|
} else {
|
2013-01-12 18:25:24 +00:00
|
|
|
start_encodable_ = 0;
|
2007-05-06 20:26:02 +00:00
|
|
|
complete_ = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Encoding::init() const
|
|
|
|
{
|
2014-12-08 21:25:40 +00:00
|
|
|
// Since the the constructor is the only method which sets complete_
|
|
|
|
// to false the test for complete_ is thread-safe without mutex.
|
2008-02-08 18:12:52 +00:00
|
|
|
if (complete_)
|
|
|
|
return;
|
|
|
|
|
2014-12-08 21:25:40 +00:00
|
|
|
static Mutex mutex;
|
|
|
|
Mutex::Locker lock(&mutex);
|
|
|
|
|
|
|
|
// We need to test again for complete_, since another thread could
|
|
|
|
// have set it to true while we were waiting for the lock and we must
|
|
|
|
// not modify an encoding which is already complete.
|
|
|
|
if (complete_)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// We do not make any member mutable so that it can be easily verified
|
|
|
|
// that all const methods are thread-safe: init() is the only const
|
|
|
|
// method which changes complete_, encodable_ and start_encodable_, and
|
|
|
|
// it uses a mutex to ensure thread-safety.
|
|
|
|
CharSet & encodable = const_cast<Encoding *>(this)->encodable_;
|
|
|
|
char_type & start_encodable = const_cast<Encoding *>(this)->start_encodable_;
|
|
|
|
|
|
|
|
start_encodable = 0;
|
2007-05-06 20:26:02 +00:00
|
|
|
// temporarily switch off lyxerr, since we will generate iconv errors
|
|
|
|
lyxerr.disable();
|
|
|
|
if (fixedwidth_) {
|
|
|
|
// We do not need to check all UCS4 code points, it is enough
|
|
|
|
// if we check all 256 code points of this encoding.
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
for (unsigned short j = 0; j < 256; ++j) {
|
2007-11-25 17:56:07 +00:00
|
|
|
char const c = char(j);
|
2007-12-12 19:28:07 +00:00
|
|
|
vector<char_type> const ucs4 = eightbit_to_ucs4(&c, 1, iconvName_);
|
2008-02-08 18:12:52 +00:00
|
|
|
if (ucs4.size() != 1)
|
|
|
|
continue;
|
|
|
|
char_type const uc = ucs4[0];
|
|
|
|
CharInfoMap::const_iterator const it = unicodesymbols.find(uc);
|
2013-01-12 18:25:24 +00:00
|
|
|
if (it == unicodesymbols.end())
|
2014-12-08 21:25:40 +00:00
|
|
|
encodable.insert(uc);
|
2013-01-12 18:25:24 +00:00
|
|
|
else if (!it->second.force()) {
|
|
|
|
if (forced_->empty() || forced_->find(uc) == forced_->end())
|
2014-12-08 21:25:40 +00:00
|
|
|
encodable.insert(uc);
|
2013-01-12 18:25:24 +00:00
|
|
|
}
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
}
|
2007-05-08 13:21:50 +00:00
|
|
|
} else {
|
2007-05-06 20:26:02 +00:00
|
|
|
// We do not know how many code points this encoding has, and
|
|
|
|
// they do not have a direct representation as a single byte,
|
|
|
|
// therefore we need to check all UCS4 code points.
|
|
|
|
// This is expensive!
|
|
|
|
for (char_type c = 0; c < max_ucs4; ++c) {
|
2007-12-12 19:28:07 +00:00
|
|
|
vector<char> const eightbit = ucs4_to_eightbit(&c, 1, iconvName_);
|
2007-05-06 20:26:02 +00:00
|
|
|
if (!eightbit.empty()) {
|
|
|
|
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
|
2013-01-12 18:25:24 +00:00
|
|
|
if (it == unicodesymbols.end())
|
2014-12-08 21:25:40 +00:00
|
|
|
encodable.insert(c);
|
2013-01-12 18:25:24 +00:00
|
|
|
else if (!it->second.force()) {
|
|
|
|
if (forced_->empty() || forced_->find(c) == forced_->end())
|
2014-12-08 21:25:40 +00:00
|
|
|
encodable.insert(c);
|
2013-01-12 18:25:24 +00:00
|
|
|
}
|
2007-05-06 20:26:02 +00:00
|
|
|
}
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
}
|
|
|
|
}
|
2007-05-06 20:26:02 +00:00
|
|
|
lyxerr.enable();
|
2015-02-20 15:37:06 +00:00
|
|
|
CharSet::iterator it = encodable.find(start_encodable);
|
|
|
|
while (it != encodable.end()) {
|
2014-12-08 21:25:40 +00:00
|
|
|
encodable.erase(it);
|
|
|
|
++start_encodable;
|
2015-02-20 15:37:06 +00:00
|
|
|
it = encodable.find(start_encodable);
|
2007-05-06 20:26:02 +00:00
|
|
|
}
|
2014-12-08 21:25:40 +00:00
|
|
|
const_cast<Encoding *>(this)->complete_ = true;
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-01-12 18:25:24 +00:00
|
|
|
bool Encoding::isForced(char_type c) const
|
|
|
|
{
|
|
|
|
if (!forced.empty() && forced.find(c) != forced.end())
|
|
|
|
return true;
|
|
|
|
return !forced_->empty() && forced_->find(c) != forced_->end();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-03-25 13:36:00 +00:00
|
|
|
bool Encoding::encodable(char_type c) const
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
{
|
2007-05-07 15:08:27 +00:00
|
|
|
// assure the used encoding is properly initialized
|
2008-02-08 18:12:52 +00:00
|
|
|
init();
|
2007-05-06 20:26:02 +00:00
|
|
|
|
2008-06-23 18:00:43 +00:00
|
|
|
if (iconvName_ == "UTF-8" && package_ == none)
|
2012-03-25 13:36:00 +00:00
|
|
|
return true;
|
2013-01-12 18:25:24 +00:00
|
|
|
if (c < start_encodable_ && !isForced(c))
|
2012-03-25 13:36:00 +00:00
|
|
|
return true;
|
2008-06-02 01:35:42 +00:00
|
|
|
if (encodable_.find(c) != encodable_.end())
|
2012-03-25 13:36:00 +00:00
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pair<docstring, bool> Encoding::latexChar(char_type c) const
|
|
|
|
{
|
|
|
|
if (encodable(c))
|
|
|
|
return make_pair(docstring(1, c), false);
|
2008-02-08 18:25:10 +00:00
|
|
|
|
2008-05-31 20:54:50 +00:00
|
|
|
// c cannot (or should not) be encoded in this encoding
|
2008-02-08 18:25:10 +00:00
|
|
|
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
|
|
|
|
if (it == unicodesymbols.end())
|
|
|
|
throw EncodingException(c);
|
2008-06-02 01:35:42 +00:00
|
|
|
// at least one of mathcommand and textcommand is nonempty
|
2013-09-29 13:07:22 +00:00
|
|
|
if (it->second.textcommand().empty())
|
2012-03-25 13:36:00 +00:00
|
|
|
return make_pair(
|
2013-09-29 13:07:22 +00:00
|
|
|
"\\ensuremath{" + it->second.mathcommand() + '}', false);
|
|
|
|
return make_pair(it->second.textcommand(), !it->second.textnotermination());
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-05 17:13:10 +00:00
|
|
|
pair<docstring, docstring> Encoding::latexString(docstring const & input, bool dryrun) const
|
2012-06-30 11:30:48 +00:00
|
|
|
{
|
|
|
|
docstring result;
|
|
|
|
docstring uncodable;
|
|
|
|
bool terminate = false;
|
|
|
|
for (size_t n = 0; n < input.size(); ++n) {
|
|
|
|
try {
|
|
|
|
char_type const c = input[n];
|
|
|
|
pair<docstring, bool> latex_char = latexChar(c);
|
|
|
|
docstring const latex = latex_char.first;
|
|
|
|
if (terminate && !prefixIs(latex, '\\')
|
|
|
|
&& !prefixIs(latex, '{')
|
|
|
|
&& !prefixIs(latex, '}')) {
|
|
|
|
// Prevent eating of a following
|
|
|
|
// space or command corruption by
|
|
|
|
// following characters
|
|
|
|
if (latex == " ")
|
|
|
|
result += "{}";
|
|
|
|
else
|
|
|
|
result += " ";
|
|
|
|
}
|
|
|
|
result += latex;
|
|
|
|
terminate = latex_char.second;
|
|
|
|
} catch (EncodingException & /* e */) {
|
|
|
|
LYXERR0("Uncodable character in latexString!");
|
|
|
|
if (dryrun) {
|
|
|
|
result += "<" + _("LyX Warning: ")
|
|
|
|
+ _("uncodable character") + " '";
|
|
|
|
result += docstring(1, input[n]);
|
|
|
|
result += "'>";
|
|
|
|
} else
|
|
|
|
uncodable += input[n];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return make_pair(result, uncodable);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-03-21 21:08:57 +00:00
|
|
|
vector<char_type> Encoding::symbolsList() const
|
2008-02-07 13:18:07 +00:00
|
|
|
{
|
|
|
|
// assure the used encoding is properly initialized
|
2008-02-08 18:12:52 +00:00
|
|
|
init();
|
2008-02-07 13:18:07 +00:00
|
|
|
|
2016-12-03 22:35:15 +00:00
|
|
|
// first all those below start_encodable_
|
|
|
|
vector<char_type> symbols;
|
2008-02-07 13:18:07 +00:00
|
|
|
for (char_type c = 0; c < start_encodable_; ++c)
|
2008-03-21 21:08:57 +00:00
|
|
|
symbols.push_back(c);
|
2017-05-01 15:34:25 +00:00
|
|
|
// add all encodable characters
|
2016-12-03 22:35:15 +00:00
|
|
|
copy(encodable_.begin(), encodable_.end(), back_inserter(symbols));
|
2017-05-01 15:34:25 +00:00
|
|
|
// now the ones from the unicodesymbols file that are not already there
|
|
|
|
for (pair<char_type, CharInfo> const & elem : unicodesymbols) {
|
|
|
|
if (find(symbols.begin(), symbols.end(), elem.first) == symbols.end())
|
|
|
|
symbols.push_back(elem.first);
|
|
|
|
}
|
|
|
|
// finally, sort the vector
|
|
|
|
sort(symbols.begin(), symbols.end());
|
2008-02-07 13:18:07 +00:00
|
|
|
return symbols;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-09-25 18:38:25 +00:00
|
|
|
bool Encodings::latexMathChar(char_type c, bool mathmode,
|
2012-03-25 13:36:00 +00:00
|
|
|
Encoding const * encoding, docstring & command,
|
|
|
|
bool & needsTermination)
|
2008-06-02 01:35:42 +00:00
|
|
|
{
|
2012-03-25 13:36:00 +00:00
|
|
|
command = empty_docstring();
|
2008-09-25 18:38:25 +00:00
|
|
|
if (encoding)
|
2012-03-25 13:36:00 +00:00
|
|
|
if (encoding->encodable(c))
|
|
|
|
command = docstring(1, c);
|
|
|
|
needsTermination = false;
|
2008-09-25 18:38:25 +00:00
|
|
|
|
2008-06-02 01:35:42 +00:00
|
|
|
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
|
2008-09-25 18:38:25 +00:00
|
|
|
if (it == unicodesymbols.end()) {
|
|
|
|
if (!encoding || command.empty())
|
2008-06-02 01:35:42 +00:00
|
|
|
throw EncodingException(c);
|
2008-09-25 18:38:25 +00:00
|
|
|
if (mathmode)
|
|
|
|
addMathSym(c);
|
2008-06-02 01:35:42 +00:00
|
|
|
return false;
|
|
|
|
}
|
2008-09-25 18:38:25 +00:00
|
|
|
// at least one of mathcommand and textcommand is nonempty
|
2013-09-29 13:07:22 +00:00
|
|
|
bool use_math = (mathmode && !it->second.mathcommand().empty()) ||
|
|
|
|
(!mathmode && it->second.textcommand().empty());
|
2008-09-25 18:38:25 +00:00
|
|
|
if (use_math) {
|
2013-09-29 13:07:22 +00:00
|
|
|
command = it->second.mathcommand();
|
2012-03-25 13:36:00 +00:00
|
|
|
needsTermination = !it->second.mathnotermination();
|
2008-09-25 18:38:25 +00:00
|
|
|
addMathCmd(c);
|
|
|
|
} else {
|
|
|
|
if (!encoding || command.empty()) {
|
2013-09-29 13:07:22 +00:00
|
|
|
command = it->second.textcommand();
|
2012-03-25 13:36:00 +00:00
|
|
|
needsTermination = !it->second.textnotermination();
|
2008-09-25 18:38:25 +00:00
|
|
|
addTextCmd(c);
|
2008-09-28 21:57:31 +00:00
|
|
|
}
|
|
|
|
if (mathmode)
|
2008-09-25 18:38:25 +00:00
|
|
|
addMathSym(c);
|
|
|
|
}
|
|
|
|
return use_math;
|
2008-06-02 01:35:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-12-08 20:05:51 +00:00
|
|
|
char_type Encodings::fromLaTeXCommand(docstring const & cmd, int cmdtype,
|
2012-03-25 13:36:00 +00:00
|
|
|
bool & combining, bool & needsTermination, set<string> * req)
|
2008-06-16 01:21:17 +00:00
|
|
|
{
|
|
|
|
CharInfoMap::const_iterator const end = unicodesymbols.end();
|
|
|
|
CharInfoMap::const_iterator it = unicodesymbols.begin();
|
2008-10-23 00:39:13 +00:00
|
|
|
for (combining = false; it != end; ++it) {
|
2016-01-08 20:06:24 +00:00
|
|
|
if (it->second.deprecated())
|
|
|
|
continue;
|
2013-09-29 13:07:22 +00:00
|
|
|
docstring const math = it->second.mathcommand();
|
|
|
|
docstring const text = it->second.textcommand();
|
2012-03-25 13:36:00 +00:00
|
|
|
if ((cmdtype & MATH_CMD) && math == cmd) {
|
|
|
|
combining = it->second.combining();
|
|
|
|
needsTermination = !it->second.mathnotermination();
|
|
|
|
if (req && it->second.mathfeature() &&
|
2013-09-29 13:07:22 +00:00
|
|
|
!it->second.mathpreamble().empty())
|
|
|
|
req->insert(it->second.mathpreamble());
|
2011-12-08 20:05:51 +00:00
|
|
|
return it->first;
|
|
|
|
}
|
|
|
|
if ((cmdtype & TEXT_CMD) && text == cmd) {
|
2012-03-25 13:36:00 +00:00
|
|
|
combining = it->second.combining();
|
|
|
|
needsTermination = !it->second.textnotermination();
|
|
|
|
if (req && it->second.textfeature() &&
|
2013-09-29 13:07:22 +00:00
|
|
|
!it->second.textpreamble().empty())
|
|
|
|
req->insert(it->second.textpreamble());
|
2008-06-16 01:21:17 +00:00
|
|
|
return it->first;
|
|
|
|
}
|
|
|
|
}
|
2012-03-25 13:36:00 +00:00
|
|
|
needsTermination = false;
|
2008-06-16 01:21:17 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-12-08 20:05:51 +00:00
|
|
|
docstring Encodings::fromLaTeXCommand(docstring const & cmd, int cmdtype,
|
2012-03-25 13:36:00 +00:00
|
|
|
bool & needsTermination, docstring & rem, set<string> * req)
|
2008-06-16 01:21:17 +00:00
|
|
|
{
|
2012-03-25 13:36:00 +00:00
|
|
|
needsTermination = false;
|
|
|
|
rem = empty_docstring();
|
2009-06-12 14:03:57 +00:00
|
|
|
bool const mathmode = cmdtype & MATH_CMD;
|
|
|
|
bool const textmode = cmdtype & TEXT_CMD;
|
2008-06-16 01:21:17 +00:00
|
|
|
docstring symbols;
|
|
|
|
size_t const cmdend = cmd.size();
|
2013-02-24 14:44:16 +00:00
|
|
|
size_t prefix = 0;
|
2008-06-16 01:21:17 +00:00
|
|
|
CharInfoMap::const_iterator const uniend = unicodesymbols.end();
|
2013-02-24 14:44:16 +00:00
|
|
|
for (size_t i = 0, j = 0; j < cmdend; ++j) {
|
2008-06-16 01:21:17 +00:00
|
|
|
// Also get the char after a backslash
|
2013-02-24 14:44:16 +00:00
|
|
|
if (j + 1 < cmdend && cmd[j] == '\\') {
|
2008-06-16 01:21:17 +00:00
|
|
|
++j;
|
2013-02-24 14:44:16 +00:00
|
|
|
prefix = 1;
|
|
|
|
// Detect things like \=*{e} as well
|
|
|
|
if (j + 3 < cmdend && cmd[j+1] == '*' &&
|
|
|
|
cmd[j+2] == '{') {
|
|
|
|
++j;
|
|
|
|
prefix = 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// position of the last character before a possible macro
|
|
|
|
// argument
|
|
|
|
size_t m = j;
|
2008-06-16 01:21:17 +00:00
|
|
|
// If a macro argument follows, get it, too
|
2013-02-24 14:44:16 +00:00
|
|
|
// Do it here only for single character commands. Other
|
|
|
|
// combining commands need this too, but they are handled in
|
|
|
|
// the loop below for performance reasons.
|
2008-06-16 01:21:17 +00:00
|
|
|
if (j + 1 < cmdend && cmd[j + 1] == '{') {
|
|
|
|
size_t k = j + 1;
|
|
|
|
int count = 1;
|
2014-05-08 22:19:55 +00:00
|
|
|
while (k < cmdend && count) {
|
2008-06-16 01:21:17 +00:00
|
|
|
k = cmd.find_first_of(from_ascii("{}"), k + 1);
|
2014-05-08 22:19:55 +00:00
|
|
|
// braces may not be balanced
|
|
|
|
if (k == docstring::npos)
|
|
|
|
break;
|
2008-06-16 01:21:17 +00:00
|
|
|
if (cmd[k] == '{')
|
|
|
|
++count;
|
|
|
|
else
|
|
|
|
--count;
|
|
|
|
}
|
|
|
|
if (k != docstring::npos)
|
|
|
|
j = k;
|
2013-02-24 14:44:16 +00:00
|
|
|
} else if (m + 1 < cmdend && isAlphaASCII(cmd[m])) {
|
|
|
|
while (m + 2 < cmdend && isAlphaASCII(cmd[m+1]))
|
|
|
|
m++;
|
2008-06-16 01:21:17 +00:00
|
|
|
}
|
|
|
|
// Start with this substring and try augmenting it when it is
|
|
|
|
// the prefix of some command in the unicodesymbols file
|
2013-02-24 14:44:16 +00:00
|
|
|
docstring subcmd = cmd.substr(i, j - i + 1);
|
2008-06-16 01:21:17 +00:00
|
|
|
|
|
|
|
CharInfoMap::const_iterator it = unicodesymbols.begin();
|
2013-02-24 14:44:16 +00:00
|
|
|
// First part of subcmd which might be a combining character
|
|
|
|
docstring combcmd = (m == j) ? docstring() : cmd.substr(i, m - i + 1);
|
|
|
|
// The combining character of combcmd if it exists
|
|
|
|
CharInfoMap::const_iterator combining = uniend;
|
2008-06-16 01:21:17 +00:00
|
|
|
size_t unicmd_size = 0;
|
2008-07-16 15:05:34 +00:00
|
|
|
char_type c = 0;
|
2008-06-16 01:21:17 +00:00
|
|
|
for (; it != uniend; ++it) {
|
2016-01-08 20:06:24 +00:00
|
|
|
if (it->second.deprecated())
|
|
|
|
continue;
|
2013-09-29 13:07:22 +00:00
|
|
|
docstring const math = mathmode ? it->second.mathcommand()
|
2009-06-12 14:03:57 +00:00
|
|
|
: docstring();
|
2013-09-29 13:07:22 +00:00
|
|
|
docstring const text = textmode ? it->second.textcommand()
|
2009-06-12 14:03:57 +00:00
|
|
|
: docstring();
|
2013-02-24 14:44:16 +00:00
|
|
|
if (!combcmd.empty() && it->second.combining() &&
|
|
|
|
(math == combcmd || text == combcmd))
|
|
|
|
combining = it;
|
2008-06-16 01:21:17 +00:00
|
|
|
size_t cur_size = max(math.size(), text.size());
|
|
|
|
// The current math or text unicode command cannot
|
|
|
|
// match, or we already matched a longer one
|
|
|
|
if (cur_size < subcmd.size() || cur_size <= unicmd_size)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
docstring tmp = subcmd;
|
|
|
|
size_t k = j;
|
|
|
|
while (prefixIs(math, tmp) || prefixIs(text, tmp)) {
|
|
|
|
++k;
|
|
|
|
if (k >= cmdend || cur_size <= tmp.size())
|
|
|
|
break;
|
|
|
|
tmp += cmd[k];
|
|
|
|
}
|
|
|
|
// No match
|
|
|
|
if (k == j)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// The last added char caused a mismatch, because
|
|
|
|
// we didn't exhaust the chars in cmd and didn't
|
|
|
|
// exceed the maximum size of the current unicmd
|
|
|
|
if (k < cmdend && cur_size > tmp.size())
|
|
|
|
tmp.resize(tmp.size() - 1);
|
|
|
|
|
|
|
|
// If this is an exact match, we found a (longer)
|
2008-12-23 12:49:42 +00:00
|
|
|
// matching entry in the unicodesymbols file.
|
2013-02-24 14:44:16 +00:00
|
|
|
if (math != tmp && text != tmp)
|
|
|
|
continue;
|
|
|
|
// If we found a combining command, we need to append
|
|
|
|
// the macro argument if this has not been done above.
|
|
|
|
if (tmp == combcmd && combining != uniend &&
|
|
|
|
k < cmdend && cmd[k] == '{') {
|
|
|
|
size_t l = k;
|
|
|
|
int count = 1;
|
2014-05-08 22:19:55 +00:00
|
|
|
while (l < cmdend && count) {
|
2013-02-24 14:44:16 +00:00
|
|
|
l = cmd.find_first_of(from_ascii("{}"), l + 1);
|
2014-05-08 22:19:55 +00:00
|
|
|
// braces may not be balanced
|
|
|
|
if (l == docstring::npos)
|
|
|
|
break;
|
2013-02-24 14:44:16 +00:00
|
|
|
if (cmd[l] == '{')
|
|
|
|
++count;
|
|
|
|
else
|
|
|
|
--count;
|
|
|
|
}
|
|
|
|
if (l != docstring::npos) {
|
|
|
|
j = l;
|
|
|
|
subcmd = cmd.substr(i, j - i + 1);
|
|
|
|
}
|
|
|
|
}
|
2008-12-23 12:49:42 +00:00
|
|
|
// If the entry doesn't start with '\', we take note
|
|
|
|
// of the match and continue (this is not a ultimate
|
|
|
|
// acceptance, as some other entry may match a longer
|
|
|
|
// portion of the cmd string). However, if the entry
|
|
|
|
// does start with '\', we accept the match only if
|
|
|
|
// this is a valid macro, i.e., either it is a single
|
|
|
|
// (nonletter) char macro, or nothing else follows,
|
2009-01-04 23:26:04 +00:00
|
|
|
// or what follows is a nonletter char, or the last
|
|
|
|
// character is a }.
|
2013-02-24 14:44:16 +00:00
|
|
|
else if (tmp[0] != '\\'
|
|
|
|
|| (tmp.size() == prefix + 1 &&
|
|
|
|
!isAlphaASCII(tmp[1]) &&
|
|
|
|
(prefix == 1 || !isAlphaASCII(tmp[2])))
|
2014-12-07 16:29:12 +00:00
|
|
|
|| k == cmdend
|
2009-01-04 23:26:04 +00:00
|
|
|
|| !isAlphaASCII(cmd[k])
|
2013-02-24 14:44:16 +00:00
|
|
|
|| tmp[tmp.size() - 1] == '}'
|
2009-01-04 23:26:04 +00:00
|
|
|
) {
|
2008-06-16 01:21:17 +00:00
|
|
|
c = it->first;
|
|
|
|
j = k - 1;
|
|
|
|
i = j + 1;
|
|
|
|
unicmd_size = cur_size;
|
2012-03-25 13:36:00 +00:00
|
|
|
if (math == tmp)
|
|
|
|
needsTermination = !it->second.mathnotermination();
|
|
|
|
else
|
|
|
|
needsTermination = !it->second.textnotermination();
|
2011-12-08 20:05:51 +00:00
|
|
|
if (req) {
|
2012-03-25 13:36:00 +00:00
|
|
|
if (math == tmp && it->second.mathfeature() &&
|
2013-09-29 13:07:22 +00:00
|
|
|
!it->second.mathpreamble().empty())
|
|
|
|
req->insert(it->second.mathpreamble());
|
2012-03-25 13:36:00 +00:00
|
|
|
if (text == tmp && it->second.textfeature() &&
|
2013-09-29 13:07:22 +00:00
|
|
|
!it->second.textpreamble().empty())
|
|
|
|
req->insert(it->second.textpreamble());
|
2011-12-08 20:05:51 +00:00
|
|
|
}
|
2008-06-16 01:21:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (unicmd_size)
|
|
|
|
symbols += c;
|
2013-02-24 14:44:16 +00:00
|
|
|
else if (combining != uniend &&
|
|
|
|
prefixIs(subcmd, combcmd + '{')) {
|
|
|
|
// We know that subcmd starts with combcmd and
|
|
|
|
// contains an argument in braces.
|
|
|
|
docstring const arg = subcmd.substr(
|
|
|
|
combcmd.length() + 1,
|
|
|
|
subcmd.length() - combcmd.length() - 2);
|
|
|
|
// If arg is a single character we can construct a
|
|
|
|
// combining sequence.
|
|
|
|
char_type a;
|
|
|
|
bool argcomb = false;
|
|
|
|
if (arg.size() == 1 && isAlnumASCII(arg[0]))
|
|
|
|
a = arg[0];
|
|
|
|
else {
|
|
|
|
// Use the version of fromLaTeXCommand() that
|
|
|
|
// parses only one command, since we cannot
|
|
|
|
// use more than one character.
|
|
|
|
bool dummy = false;
|
|
|
|
set<string> r;
|
|
|
|
a = fromLaTeXCommand(arg, cmdtype, argcomb,
|
|
|
|
dummy, &r);
|
|
|
|
if (a && req && !argcomb)
|
|
|
|
req->insert(r.begin(), r.end());
|
|
|
|
}
|
|
|
|
if (a && !argcomb) {
|
|
|
|
// In unicode the combining character comes
|
|
|
|
// after its base
|
|
|
|
symbols += a;
|
|
|
|
symbols += combining->first;
|
2013-02-28 21:23:23 +00:00
|
|
|
i = j + 1;
|
2013-02-24 14:44:16 +00:00
|
|
|
unicmd_size = 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (j + 1 == cmdend && !unicmd_size) {
|
2008-06-16 01:21:17 +00:00
|
|
|
// No luck. Return what remains
|
|
|
|
rem = cmd.substr(i);
|
2012-03-25 13:36:00 +00:00
|
|
|
if (needsTermination && !rem.empty()) {
|
|
|
|
if (rem.substr(0, 2) == "{}") {
|
|
|
|
rem = rem.substr(2);
|
|
|
|
needsTermination = false;
|
|
|
|
} else if (rem[0] == ' ') {
|
|
|
|
needsTermination = false;
|
|
|
|
// LaTeX would swallow all spaces
|
|
|
|
rem = ltrim(rem);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-06-16 01:21:17 +00:00
|
|
|
}
|
|
|
|
return symbols;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-08-23 05:46:35 +00:00
|
|
|
CharInfo const & Encodings::unicodeCharInfo(char_type c)
|
|
|
|
{
|
|
|
|
static CharInfo empty;
|
|
|
|
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
|
|
|
|
return it != unicodesymbols.end() ? it->second : empty;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
bool Encodings::isCombiningChar(char_type c)
|
|
|
|
{
|
|
|
|
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
|
|
|
|
if (it != unicodesymbols.end())
|
2012-03-25 13:36:00 +00:00
|
|
|
return it->second.combining();
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-03-09 09:05:13 +00:00
|
|
|
string const Encodings::TIPAShortcut(char_type c)
|
|
|
|
{
|
|
|
|
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
|
|
|
|
if (it != unicodesymbols.end())
|
2013-09-29 13:07:22 +00:00
|
|
|
return it->second.tipashortcut();
|
2012-03-09 09:05:13 +00:00
|
|
|
return string();
|
|
|
|
}
|
|
|
|
|
2019-03-11 14:24:22 +00:00
|
|
|
|
|
|
|
string const Encodings::isKnownScriptChar(char_type const c)
|
2007-10-12 18:21:51 +00:00
|
|
|
{
|
|
|
|
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
|
2007-10-15 13:04:53 +00:00
|
|
|
|
|
|
|
if (it == unicodesymbols.end())
|
2019-03-11 14:24:22 +00:00
|
|
|
return string();
|
|
|
|
// FIXME: parse complex textpreamble (may be list or alternatives,
|
|
|
|
// e.g., "subscript,textgreek" or "textcomp|textgreek")
|
|
|
|
if (it->second.textpreamble() == "textgreek"
|
|
|
|
|| it->second.textpreamble() == "textcyrillic")
|
|
|
|
return it->second.textpreamble();
|
|
|
|
return string();
|
2007-10-12 18:21:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-03-11 14:24:22 +00:00
|
|
|
bool Encodings::fontencSupportsScript(string const & fontenc, string const & script)
|
2018-04-21 10:55:11 +00:00
|
|
|
{
|
|
|
|
if (script == "textgreek")
|
2019-03-11 14:24:22 +00:00
|
|
|
return (fontenc == "LGR" || fontenc == "TU");
|
|
|
|
if (script == "textcyrillic")
|
|
|
|
return (fontenc == "T2A" || fontenc == "T2B" || fontenc == "T2C"
|
|
|
|
|| fontenc == "X2" || fontenc == "TU");
|
2018-04-21 10:55:11 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-09-26 15:53:15 +00:00
|
|
|
bool Encodings::isMathAlpha(char_type c)
|
|
|
|
{
|
|
|
|
return mathalpha.count(c);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-09-10 11:36:45 +00:00
|
|
|
bool Encodings::isUnicodeTextOnly(char_type c)
|
|
|
|
{
|
|
|
|
if (isASCII(c) || isMathAlpha(c))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
|
|
|
|
return it == unicodesymbols.end() || it->second.mathcommand().empty();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-12-30 19:39:33 +00:00
|
|
|
Encoding const *
|
|
|
|
Encodings::fromLyXName(string const & name, bool allowUnsafe) const
|
2000-10-10 12:36:36 +00:00
|
|
|
{
|
2008-02-08 18:25:10 +00:00
|
|
|
EncodingList::const_iterator const it = encodinglist.find(name);
|
2014-12-08 20:29:25 +00:00
|
|
|
if (it == encodinglist.end())
|
|
|
|
return 0;
|
2012-12-30 19:39:33 +00:00
|
|
|
if (!allowUnsafe && it->second.unsafe())
|
|
|
|
return 0;
|
2014-12-08 20:29:25 +00:00
|
|
|
return &it->second;
|
2000-10-10 12:36:36 +00:00
|
|
|
}
|
|
|
|
|
2006-11-03 10:35:41 +00:00
|
|
|
|
2012-12-30 19:39:33 +00:00
|
|
|
Encoding const *
|
2013-01-19 18:47:15 +00:00
|
|
|
Encodings::fromLaTeXName(string const & n, int const & p, bool allowUnsafe) const
|
2006-11-03 10:35:41 +00:00
|
|
|
{
|
2009-09-22 13:05:43 +00:00
|
|
|
string name = n;
|
|
|
|
// FIXME: if we have to test for too many of these synonyms,
|
|
|
|
// we should instead extend the format of lib/encodings
|
|
|
|
if (n == "ansinew")
|
|
|
|
name = "cp1252";
|
|
|
|
|
2007-12-12 19:28:07 +00:00
|
|
|
// We don't use find_if because it makes copies of the pairs in
|
2007-01-28 10:07:17 +00:00
|
|
|
// the map.
|
|
|
|
// This linear search is OK since we don't have many encodings.
|
|
|
|
// Users could even optimize it by putting the encodings they use
|
|
|
|
// most at the top of lib/encodings.
|
|
|
|
EncodingList::const_iterator const end = encodinglist.end();
|
|
|
|
for (EncodingList::const_iterator it = encodinglist.begin(); it != end; ++it)
|
2013-01-19 18:47:15 +00:00
|
|
|
if ((it->second.latexName() == name) && (it->second.package() & p)
|
|
|
|
&& (!it->second.unsafe() || allowUnsafe))
|
|
|
|
return &it->second;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Encoding const *
|
|
|
|
Encodings::fromIconvName(string const & n, int const & p, bool allowUnsafe) const
|
|
|
|
{
|
|
|
|
EncodingList::const_iterator const end = encodinglist.end();
|
|
|
|
for (EncodingList::const_iterator it = encodinglist.begin(); it != end; ++it)
|
|
|
|
if ((it->second.iconvName() == n) && (it->second.package() & p)
|
|
|
|
&& (!it->second.unsafe() || allowUnsafe))
|
2007-01-28 10:07:17 +00:00
|
|
|
return &it->second;
|
|
|
|
return 0;
|
2006-11-03 10:35:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-10-10 12:36:36 +00:00
|
|
|
Encodings::Encodings()
|
2012-10-27 13:45:27 +00:00
|
|
|
{}
|
2000-10-10 12:36:36 +00:00
|
|
|
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
|
|
|
|
void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
|
2000-10-10 12:36:36 +00:00
|
|
|
{
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
// We must read the symbolsfile first, because the Encoding
|
|
|
|
// constructor depends on it.
|
2013-02-19 21:19:10 +00:00
|
|
|
CharSetMap forcednotselected;
|
2008-04-02 23:06:22 +00:00
|
|
|
Lexer symbolslex;
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
symbolslex.setFile(symbolsfile);
|
2008-06-02 01:35:42 +00:00
|
|
|
bool getNextToken = true;
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
while (symbolslex.isOK()) {
|
|
|
|
char_type symbol;
|
|
|
|
|
2008-06-02 01:35:42 +00:00
|
|
|
if (getNextToken) {
|
|
|
|
if (!symbolslex.next(true))
|
|
|
|
break;
|
|
|
|
} else
|
|
|
|
getNextToken = true;
|
2008-02-08 18:25:10 +00:00
|
|
|
|
|
|
|
istringstream is(symbolslex.getString());
|
|
|
|
// reading symbol directly does not work if
|
|
|
|
// char_type == wchar_t.
|
|
|
|
boost::uint32_t tmp;
|
|
|
|
if(!(is >> hex >> tmp))
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
break;
|
2008-02-08 18:25:10 +00:00
|
|
|
symbol = tmp;
|
|
|
|
|
|
|
|
if (!symbolslex.next(true))
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
break;
|
2013-09-29 13:07:22 +00:00
|
|
|
docstring textcommand = symbolslex.getDocString();
|
2008-02-08 18:25:10 +00:00
|
|
|
if (!symbolslex.next(true))
|
|
|
|
break;
|
2013-09-29 13:07:22 +00:00
|
|
|
string textpreamble = symbolslex.getString();
|
2008-02-08 18:25:10 +00:00
|
|
|
if (!symbolslex.next(true))
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
break;
|
2013-09-29 13:07:22 +00:00
|
|
|
string sflags = symbolslex.getString();
|
2014-12-07 16:29:12 +00:00
|
|
|
|
2013-09-29 13:07:22 +00:00
|
|
|
string tipashortcut;
|
|
|
|
int flags = 0;
|
|
|
|
|
|
|
|
if (suffixIs(textcommand, '}'))
|
|
|
|
flags |= CharInfoTextNoTermination;
|
|
|
|
while (!sflags.empty()) {
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
string flag;
|
2013-09-29 13:07:22 +00:00
|
|
|
sflags = split(sflags, flag, ',');
|
2008-09-26 15:53:15 +00:00
|
|
|
if (flag == "combining") {
|
2013-09-29 13:07:22 +00:00
|
|
|
flags |= CharInfoCombining;
|
2008-09-26 15:53:15 +00:00
|
|
|
} else if (flag == "force") {
|
2013-09-29 13:07:22 +00:00
|
|
|
flags |= CharInfoForce;
|
2008-06-23 18:00:43 +00:00
|
|
|
forced.insert(symbol);
|
2013-01-12 18:25:24 +00:00
|
|
|
} else if (prefixIs(flag, "force=")) {
|
2018-02-24 04:43:59 +00:00
|
|
|
vector<string> encs =
|
2013-02-17 09:19:58 +00:00
|
|
|
getVectorFromString(flag.substr(6), ";");
|
2018-02-24 04:43:59 +00:00
|
|
|
for (size_t i = 0; i < encs.size(); ++i)
|
|
|
|
forcedselected[encs[i]].insert(symbol);
|
2013-09-29 13:07:22 +00:00
|
|
|
flags |= CharInfoForceSelected;
|
2013-02-19 21:19:10 +00:00
|
|
|
} else if (prefixIs(flag, "force!=")) {
|
2018-02-24 04:43:59 +00:00
|
|
|
vector<string> encs =
|
2013-02-19 21:19:10 +00:00
|
|
|
getVectorFromString(flag.substr(7), ";");
|
2018-02-24 04:43:59 +00:00
|
|
|
for (size_t i = 0; i < encs.size(); ++i)
|
|
|
|
forcednotselected[encs[i]].insert(symbol);
|
2013-09-29 13:07:22 +00:00
|
|
|
flags |= CharInfoForceSelected;
|
2008-09-26 15:53:15 +00:00
|
|
|
} else if (flag == "mathalpha") {
|
|
|
|
mathalpha.insert(symbol);
|
2012-03-25 13:36:00 +00:00
|
|
|
} else if (flag == "notermination=text") {
|
2013-09-29 13:07:22 +00:00
|
|
|
flags |= CharInfoTextNoTermination;
|
2012-03-25 13:36:00 +00:00
|
|
|
} else if (flag == "notermination=math") {
|
2013-09-29 13:07:22 +00:00
|
|
|
flags |= CharInfoMathNoTermination;
|
2012-03-25 13:36:00 +00:00
|
|
|
} else if (flag == "notermination=both") {
|
2013-09-29 13:07:22 +00:00
|
|
|
flags |= CharInfoTextNoTermination;
|
|
|
|
flags |= CharInfoMathNoTermination;
|
2012-03-25 13:36:00 +00:00
|
|
|
} else if (flag == "notermination=none") {
|
2013-09-29 13:07:22 +00:00
|
|
|
flags &= ~CharInfoTextNoTermination;
|
|
|
|
flags &= ~CharInfoMathNoTermination;
|
2012-03-09 09:05:13 +00:00
|
|
|
} else if (contains(flag, "tipashortcut=")) {
|
2013-09-29 13:07:22 +00:00
|
|
|
tipashortcut = split(flag, '=');
|
2016-01-08 20:06:24 +00:00
|
|
|
} else if (flag == "deprecated") {
|
|
|
|
flags |= CharInfoDeprecated;
|
2008-09-26 15:53:15 +00:00
|
|
|
} else {
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
lyxerr << "Ignoring unknown flag `" << flag
|
2007-05-28 22:27:45 +00:00
|
|
|
<< "' for symbol `0x"
|
2007-12-12 19:28:07 +00:00
|
|
|
<< hex << symbol << dec
|
2007-03-28 13:57:22 +00:00
|
|
|
<< "'." << endl;
|
2008-09-26 15:53:15 +00:00
|
|
|
}
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
}
|
2008-06-02 01:35:42 +00:00
|
|
|
// mathcommand and mathpreamble have been added for 1.6.0.
|
|
|
|
// make them optional so that old files still work.
|
|
|
|
int const lineno = symbolslex.lineNumber();
|
|
|
|
bool breakout = false;
|
2013-09-29 13:07:22 +00:00
|
|
|
docstring mathcommand;
|
|
|
|
string mathpreamble;
|
2008-06-02 01:35:42 +00:00
|
|
|
if (symbolslex.next(true)) {
|
|
|
|
if (symbolslex.lineNumber() != lineno) {
|
|
|
|
// line in old format without mathcommand and mathpreamble
|
|
|
|
getNextToken = false;
|
|
|
|
} else {
|
2013-09-29 13:07:22 +00:00
|
|
|
mathcommand = symbolslex.getDocString();
|
|
|
|
if (suffixIs(mathcommand, '}'))
|
|
|
|
flags |= CharInfoMathNoTermination;
|
2008-06-02 01:35:42 +00:00
|
|
|
if (symbolslex.next(true)) {
|
|
|
|
if (symbolslex.lineNumber() != lineno) {
|
|
|
|
// line in new format with mathcommand only
|
|
|
|
getNextToken = false;
|
|
|
|
} else {
|
|
|
|
// line in new format with mathcommand and mathpreamble
|
2013-09-29 13:07:22 +00:00
|
|
|
mathpreamble = symbolslex.getString();
|
2008-06-02 01:35:42 +00:00
|
|
|
}
|
|
|
|
} else
|
|
|
|
breakout = true;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
breakout = true;
|
|
|
|
}
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
|
2011-10-18 19:32:02 +00:00
|
|
|
// backward compatibility
|
2013-09-29 13:07:22 +00:00
|
|
|
if (mathpreamble == "esintoramsmath")
|
|
|
|
mathpreamble = "esint|amsmath";
|
|
|
|
|
|
|
|
if (!textpreamble.empty())
|
|
|
|
if (textpreamble[0] != '\\')
|
|
|
|
flags |= CharInfoTextFeature;
|
|
|
|
if (!mathpreamble.empty())
|
|
|
|
if (mathpreamble[0] != '\\')
|
|
|
|
flags |= CharInfoMathFeature;
|
|
|
|
|
|
|
|
CharInfo info = CharInfo(
|
|
|
|
textcommand, mathcommand,
|
|
|
|
textpreamble, mathpreamble,
|
|
|
|
tipashortcut, flags);
|
2007-11-15 20:04:51 +00:00
|
|
|
LYXERR(Debug::INFO, "Read unicode symbol " << symbol << " '"
|
2013-09-29 13:07:22 +00:00
|
|
|
<< to_utf8(info.textcommand()) << "' '" << info.textpreamble()
|
|
|
|
<< " '" << info.textfeature() << ' ' << info.textnotermination()
|
|
|
|
<< ' ' << to_utf8(info.mathcommand()) << "' '" << info.mathpreamble()
|
|
|
|
<< "' " << info.mathfeature() << ' ' << info.mathnotermination()
|
|
|
|
<< ' ' << info.combining() << ' ' << info.force()
|
|
|
|
<< ' ' << info.forceselected());
|
2008-06-02 01:35:42 +00:00
|
|
|
|
|
|
|
// we assume that at least one command is nonempty when using unicodesymbols
|
2013-09-29 13:07:22 +00:00
|
|
|
if (info.isUnicodeSymbol()) {
|
2008-06-02 01:35:42 +00:00
|
|
|
unicodesymbols[symbol] = info;
|
2013-09-29 13:07:22 +00:00
|
|
|
}
|
2008-06-02 01:35:42 +00:00
|
|
|
|
|
|
|
if (breakout)
|
|
|
|
break;
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Now read the encodings
|
2008-04-03 20:55:09 +00:00
|
|
|
enum {
|
2000-10-10 12:36:36 +00:00
|
|
|
et_encoding = 1,
|
2010-12-17 19:56:51 +00:00
|
|
|
et_end
|
2000-10-10 12:36:36 +00:00
|
|
|
};
|
|
|
|
|
2008-04-03 20:55:09 +00:00
|
|
|
LexerKeyword encodingtags[] = {
|
2000-10-10 12:36:36 +00:00
|
|
|
{ "encoding", et_encoding },
|
|
|
|
{ "end", et_end }
|
|
|
|
};
|
|
|
|
|
2008-04-02 23:06:22 +00:00
|
|
|
Lexer lex(encodingtags);
|
Add machinery to output arbitrary unicode characters with LaTeX commands
read from a text file.
* src/encoding.[Ch]
(Encoding::latexChar): New, output a character to LaTeX
(Encoding::validate): New, add needed preamble stuff for a character
(Encodings::read): Read new unicodesymbols file
(Encodings::isCombiningChar): New, is a character a combining char?
* src/paragraph_pimpl.C
(isEncoding): Delete, no longer needed
(getEncoding): New, get the real encoding of a font
(Paragraph::Pimpl::latexSurrogatePair): New, output a surrogate pair
to LaTeX
(Paragraph::Pimpl::simpleTeXBlanks): Use latexSurrogatePair if needed
(Paragraph::Pimpl::simpleTeXSpecialChars): Ditto, and replace several
hardcoded characters with a call of encoding.latexChar()
(Paragraph::Pimpl::validate): replace several hardcoded characters
with a call of encoding.validate()
* src/support/debugstream.h
(basic_debugstream::disable): New, disable the stream completely
(basic_debugstream::enable): New, reenable the stream
* src/lyx_main.[Ch]: Adjust to changes above
* src/paragraph.C: Ditto
* lib/unicodesymbols: New file with UCS4 -> LaTeX command mapping.
It is far from complete yet, but contains most accents on latin
characters.
* lib/Makefile.am: add lib/unicodesymbols
* development/scons/scons_manifest.py: ditto
* development/tools/unicodesymbols.py: Helper script to update
lib/unicodesymbols with new symbols
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-28 21:27:45 +00:00
|
|
|
lex.setFile(encfile);
|
2008-04-05 21:24:57 +00:00
|
|
|
lex.setContext("Encodings::read");
|
2001-08-06 19:12:46 +00:00
|
|
|
while (lex.isOK()) {
|
2000-10-10 12:36:36 +00:00
|
|
|
switch (lex.lex()) {
|
|
|
|
case et_encoding:
|
|
|
|
{
|
|
|
|
lex.next();
|
2001-08-06 19:12:46 +00:00
|
|
|
string const name = lex.getString();
|
2000-10-10 12:36:36 +00:00
|
|
|
lex.next();
|
2001-08-06 19:12:46 +00:00
|
|
|
string const latexname = lex.getString();
|
2006-10-26 15:01:45 +00:00
|
|
|
lex.next();
|
2008-07-11 08:56:17 +00:00
|
|
|
string const guiname = lex.getString();
|
|
|
|
lex.next();
|
2006-10-26 15:01:45 +00:00
|
|
|
string const iconvname = lex.getString();
|
2007-05-06 20:26:02 +00:00
|
|
|
lex.next();
|
|
|
|
string const width = lex.getString();
|
2007-09-14 08:05:19 +00:00
|
|
|
bool fixedwidth = false;
|
2012-12-30 19:39:33 +00:00
|
|
|
bool unsafe = false;
|
2007-05-06 20:26:02 +00:00
|
|
|
if (width == "fixed")
|
|
|
|
fixedwidth = true;
|
|
|
|
else if (width == "variable")
|
|
|
|
fixedwidth = false;
|
2012-12-30 19:39:33 +00:00
|
|
|
else if (width == "variableunsafe") {
|
|
|
|
fixedwidth = false;
|
|
|
|
unsafe = true;
|
|
|
|
}
|
2008-03-21 21:08:57 +00:00
|
|
|
else
|
2008-04-05 21:24:57 +00:00
|
|
|
lex.printError("Unknown width");
|
2008-03-21 21:08:57 +00:00
|
|
|
|
2007-05-06 20:26:02 +00:00
|
|
|
lex.next();
|
|
|
|
string const p = lex.getString();
|
2007-09-14 08:05:19 +00:00
|
|
|
Encoding::Package package = Encoding::none;
|
2007-05-06 20:26:02 +00:00
|
|
|
if (p == "none")
|
2008-04-05 21:24:57 +00:00
|
|
|
package = Encoding::none;
|
2007-05-06 20:26:02 +00:00
|
|
|
else if (p == "inputenc")
|
|
|
|
package = Encoding::inputenc;
|
|
|
|
else if (p == "CJK")
|
|
|
|
package = Encoding::CJK;
|
2008-08-18 17:26:09 +00:00
|
|
|
else if (p == "japanese")
|
|
|
|
package = Encoding::japanese;
|
2008-03-21 21:08:57 +00:00
|
|
|
else
|
2008-04-05 21:24:57 +00:00
|
|
|
lex.printError("Unknown package");
|
2008-03-21 21:08:57 +00:00
|
|
|
|
2007-11-15 20:04:51 +00:00
|
|
|
LYXERR(Debug::INFO, "Reading encoding " << name);
|
2007-05-06 20:26:02 +00:00
|
|
|
encodinglist[name] = Encoding(name, latexname,
|
2012-12-30 19:39:33 +00:00
|
|
|
guiname, iconvname, fixedwidth, unsafe,
|
|
|
|
package);
|
2008-03-21 21:08:57 +00:00
|
|
|
|
2000-10-10 12:36:36 +00:00
|
|
|
if (lex.lex() != et_end)
|
2008-04-05 21:24:57 +00:00
|
|
|
lex.printError("Missing end");
|
2000-10-10 12:36:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case et_end:
|
2008-04-05 21:24:57 +00:00
|
|
|
lex.printError("Misplaced end");
|
2000-10-10 12:36:36 +00:00
|
|
|
break;
|
2007-04-26 11:30:54 +00:00
|
|
|
case Lexer::LEX_FEOF:
|
2000-10-13 05:57:05 +00:00
|
|
|
break;
|
2000-10-10 12:36:36 +00:00
|
|
|
default:
|
2008-04-05 21:24:57 +00:00
|
|
|
lex.printError("Unknown tag");
|
2000-10-10 12:36:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2013-02-19 21:19:10 +00:00
|
|
|
|
|
|
|
// Move all information from forcednotselected to forcedselected
|
|
|
|
for (CharSetMap::const_iterator it1 = forcednotselected.begin(); it1 != forcednotselected.end(); ++it1) {
|
|
|
|
for (CharSetMap::iterator it2 = forcedselected.begin(); it2 != forcedselected.end(); ++it2) {
|
|
|
|
if (it2->first != it1->first)
|
|
|
|
it2->second.insert(it1->second.begin(), it1->second.end());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-10-10 12:36:36 +00:00
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
} // namespace lyx
|