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
|
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* \author Lars Gullik Bj<EFBFBD>nnes
|
|
|
|
|
* \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
|
|
|
|
|
2008-09-26 15:53:15 +00:00
|
|
|
|
#include "Buffer.h"
|
|
|
|
|
#include "InsetIterator.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 "LaTeXFeatures.h"
|
2007-04-26 11:30:54 +00:00
|
|
|
|
#include "Lexer.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
|
#include "LyXRC.h"
|
2000-10-10 12:36:36 +00:00
|
|
|
|
|
2007-11-29 07:04:28 +00:00
|
|
|
|
#include "support/debug.h"
|
Rename files in src/support, step one.
src/support/package.h src/support/Package.h Package
src/support/package.C.in src/support/Package.C.in Package
src/support/path.h src/support/Path.h Path
src/support/fs_extras.h src/support/fs_extras.h NOCLASSES
src/support/RandomAccessList.h src/support/RandomAccessList.h RandomAccessList
src/support/lyxmanip.h src/support/lyxmanip.h NOCLASSES
src/support/rename.C src/support/rename.cpp NOCLASSES
src/support/abort.C src/support/abort.cpp NOCLASSES
src/support/lyxlib.h src/support/lyxlib.h NOCLASSES
src/support/ExceptionMessage.h src/support/ExceptionMessage.h ExceptionMessage
src/support/copy.C src/support/copy.cpp NOCLASSES
src/support/limited_stack.h src/support/limited_stack.h limited_stack
src/support/filefilterlist.C src/support/FileFilterList.cpp ['FileFilterList', 'Filter']
src/support/cow_ptr.h src/support/cow_ptr.h cow_ptr
src/support/os_unix.C src/support/os_unix.cpp NOCLASSES
src/support/socktools.h src/support/socktools.h NOCLASSES
src/support/forkedcontr.h src/support/ForkedcallsController.h ForkedcallsController
src/support/os.h src/support/os.h NOCLASSES
src/support/FileMonitor.h src/support/FileMonitor.h FileMonitor
src/support/copied_ptr.h src/support/copied_ptr.h copied_ptr
src/support/translator.h src/support/Translator.h Translator
src/support/filetools.C src/support/filetools.cpp NOCLASSES
src/support/unlink.C src/support/unlink.cpp NOCLASSES
src/support/os_win32.C src/support/os_win32.cpp GetFolderPath
src/support/lstrings.C src/support/lstrings.cpp NOCLASSES
src/support/qstring_helpers.C src/support/qstring_helpers.cpp NOCLASSES
src/support/getcwd.C src/support/getcwd.cpp NOCLASSES
src/support/systemcall.C src/support/Systemcall.cpp Systemcall
src/support/lyxalgo.h src/support/lyxalgo.h NOCLASSES
src/support/filefilterlist.h src/support/FileFilterList.h ['FileFilterList', 'Filter']
src/support/unicode.C src/support/unicode.cpp IconvProcessor
src/support/userinfo.C src/support/userinfo.cpp NOCLASSES
src/support/lyxtime.C src/support/lyxtime.cpp NOCLASSES
src/support/kill.C src/support/kill.cpp NOCLASSES
src/support/docstring.C src/support/docstring.cpp to_local8bit_failure
src/support/os_cygwin.C src/support/os_cygwin.cpp NOCLASSES
src/support/lyxsum.C src/support/lyxsum.cpp NOCLASSES
src/support/environment.C src/support/environment.cpp NOCLASSES
src/support/filetools.h src/support/filetools.h NOCLASSES
src/support/textutils.C src/support/textutils.cpp NOCLASSES
src/support/mkdir.C src/support/mkdir.cpp NOCLASSES
src/support/forkedcall.C src/support/Forkedcall.cpp ['ForkedProcess', 'Forkedcall']
src/support/tempname.C src/support/tempname.cpp NOCLASSES
src/support/os_win32.h src/support/os_win32.h GetFolderPath
src/support/types.h src/support/types.h NOCLASSES
src/support/lstrings.h src/support/lstrings.h NOCLASSES
src/support/forkedcallqueue.C src/support/ForkedCallQueue.cpp ForkedCallQueue
src/support/qstring_helpers.h src/support/qstring_helpers.h NOCLASSES
src/support/convert.C src/support/convert.cpp NOCLASSES
src/support/filename.C src/support/FileName.cpp ['FileName', 'DocFileName']
src/support/tests/convert.C src/support/tests/convert.cpp NOCLASSES
src/support/tests/filetools.C src/support/tests/filetools.cpp NOCLASSES
src/support/tests/lstrings.C src/support/tests/lstrings.cpp NOCLASSES
src/support/tests/boost.C src/support/tests/boost.cpp NOCLASSES
src/support/docstream.C src/support/docstream.cpp ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/std_istream.h src/support/std_istream.h NOCLASSES
src/support/systemcall.h src/support/Systemcall.h Systemcall
src/support/chdir.C src/support/chdir.cpp NOCLASSES
src/support/std_ostream.h src/support/std_ostream.h NOCLASSES
src/support/unicode.h src/support/unicode.h IconvProcessor
src/support/path.C src/support/Path.cpp Path
src/support/fs_extras.C src/support/fs_extras.cpp NOCLASSES
src/support/userinfo.h src/support/userinfo.h NOCLASSES
src/support/lyxtime.h src/support/lyxtime.h NOCLASSES
src/support/docstring.h src/support/docstring.h to_local8bit_failure
src/support/debugstream.h src/support/debugstream.h basic_debugstream
src/support/environment.h src/support/environment.h NOCLASSES
src/support/textutils.h src/support/textutils.h NOCLASSES
src/support/forkedcall.h src/support/Forkedcall.h ['ForkedProcess', 'Forkedcall']
src/support/socktools.C src/support/socktools.cpp NOCLASSES
src/support/forkedcallqueue.h src/support/ForkedCallQueue.h ForkedCallQueue
src/support/forkedcontr.C src/support/ForkedcallsController.cpp ForkedcallsController
src/support/os.C src/support/os.cpp NOCLASSES
src/support/convert.h src/support/convert.h NOCLASSES
src/support/filename.h src/support/FileName.h ['FileName', 'DocFileName']
src/support/docstream.h src/support/docstream.h ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/FileMonitor.C src/support/FileMonitor.cpp FileMonitor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18024 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 05:12:52 +00:00
|
|
|
|
#include "support/FileName.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"
|
2008-12-23 13:01:56 +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>
|
|
|
|
|
|
2007-01-29 08:49:01 +00:00
|
|
|
|
#include <sstream>
|
|
|
|
|
|
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 {
|
|
|
|
|
|
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-05-31 18:53:01 +00:00
|
|
|
|
char_type arabic_table[172][4] = {
|
2007-03-24 21:12:29 +00:00
|
|
|
|
{0xfe80, 0xfe80, 0xfe80, 0xfe80}, // 0x0621 = hamza
|
|
|
|
|
{0xfe81, 0xfe82, 0xfe81, 0xfe82}, // 0x0622 = ligature madda on alef
|
|
|
|
|
{0xfe83, 0xfe84, 0xfe83, 0xfe84}, // 0x0623 = ligature hamza on alef
|
|
|
|
|
{0xfe85, 0xfe86, 0xfe85, 0xfe86}, // 0x0624 = ligature hamza on waw
|
|
|
|
|
{0xfe87, 0xfe88, 0xfe87, 0xfe88}, // 0x0625 = ligature hamza under alef
|
|
|
|
|
{0xfe89, 0xfe8a, 0xfe8b, 0xfe8c}, // 0x0626 = ligature hamza on ya
|
|
|
|
|
{0xfe8d, 0xfe8e, 0xfe8d, 0xfe8e}, // 0x0627 = alef
|
|
|
|
|
{0xfe8f, 0xfe90, 0xfe91, 0xfe92}, // 0x0628 = baa
|
|
|
|
|
{0xfe93, 0xfe94, 0xfe93, 0xfe94}, // 0x0629 = taa marbuta
|
|
|
|
|
{0xfe95, 0xfe96, 0xfe97, 0xfe98}, // 0x062a = taa
|
|
|
|
|
{0xfe99, 0xfe9a, 0xfe9b, 0xfe9c}, // 0x062b = thaa
|
|
|
|
|
{0xfe9d, 0xfe9e, 0xfe9f, 0xfea0}, // 0x062c = jeem
|
|
|
|
|
{0xfea1, 0xfea2, 0xfea3, 0xfea4}, // 0x062d = haa
|
|
|
|
|
{0xfea5, 0xfea6, 0xfea7, 0xfea8}, // 0x062e = khaa
|
|
|
|
|
{0xfea9, 0xfeaa, 0xfea9, 0xfeaa}, // 0x062f = dal
|
|
|
|
|
|
|
|
|
|
{0xfeab, 0xfeac, 0xfeab, 0xfeac}, // 0x0630 = thal
|
|
|
|
|
{0xfead, 0xfeae, 0xfead, 0xfeae}, // 0x0631 = ra
|
|
|
|
|
{0xfeaf, 0xfeb0, 0xfeaf, 0xfeb0}, // 0x0632 = zain
|
|
|
|
|
{0xfeb1, 0xfeb2, 0xfeb3, 0xfeb4}, // 0x0633 = seen
|
|
|
|
|
{0xfeb5, 0xfeb6, 0xfeb7, 0xfeb8}, // 0x0634 = sheen
|
|
|
|
|
{0xfeb9, 0xfeba, 0xfebb, 0xfebc}, // 0x0635 = sad
|
|
|
|
|
{0xfebd, 0xfebe, 0xfebf, 0xfec0}, // 0x0636 = dad
|
|
|
|
|
{0xfec1, 0xfec2, 0xfec3, 0xfec4}, // 0x0637 = tah
|
|
|
|
|
{0xfec5, 0xfec6, 0xfec7, 0xfec8}, // 0x0638 = zah
|
|
|
|
|
{0xfec9, 0xfeca, 0xfecb, 0xfecc}, // 0x0639 = ain
|
|
|
|
|
{0xfecd, 0xfece, 0xfecf, 0xfed0}, // 0x063a = ghain
|
|
|
|
|
{0, 0, 0, 0}, // 0x063b
|
|
|
|
|
{0, 0, 0, 0}, // 0x063c
|
|
|
|
|
{0, 0, 0, 0}, // 0x063d
|
|
|
|
|
{0, 0, 0, 0}, // 0x063e
|
|
|
|
|
{0, 0, 0, 0}, // 0x063f
|
|
|
|
|
|
|
|
|
|
{0, 0, 0, 0}, // 0x0640
|
|
|
|
|
{0xfed1, 0xfed2, 0xfed3, 0xfed4}, // 0x0641 = fa
|
|
|
|
|
{0xfed5, 0xfed6, 0xfed7, 0xfed8}, // 0x0642 = qaf
|
|
|
|
|
{0xfed9, 0xfeda, 0xfedb, 0xfedc}, // 0x0643 = kaf
|
|
|
|
|
{0xfedd, 0xfede, 0xfedf, 0xfee0}, // 0x0644 = lam
|
|
|
|
|
{0xfee1, 0xfee2, 0xfee3, 0xfee4}, // 0x0645 = meem
|
|
|
|
|
{0xfee5, 0xfee6, 0xfee7, 0xfee8}, // 0x0646 = noon
|
|
|
|
|
{0xfee9, 0xfeea, 0xfeeb, 0xfeec}, // 0x0647 = ha
|
|
|
|
|
{0xfeed, 0xfeee, 0xfeed, 0xfeee}, // 0x0648 = waw
|
|
|
|
|
{0xfeef, 0xfef0, 0xfeef, 0xfef0}, // 0x0649 = alef maksura
|
|
|
|
|
{0xfef1, 0xfef2, 0xfef3, 0xfef4}, // 0x064a = ya
|
|
|
|
|
{0x065b, 0x065b, 0x065b, 0x065b}, // 0x064b = fathatan
|
|
|
|
|
{0x065c, 0x065c, 0x065c, 0x065c}, // 0x064c = dammatan
|
|
|
|
|
{0x064d, 0x064d, 0x064d, 0x064d}, // 0x064d = kasratan
|
|
|
|
|
{0x064e, 0x064e, 0x064e, 0x064e}, // 0x064e = fatha
|
|
|
|
|
{0x064f, 0x064f, 0x064f, 0x064f}, // 0x064f = damma
|
|
|
|
|
|
|
|
|
|
{0x0650, 0x0650, 0x0650, 0x0650}, // 0x0650 = kasra
|
|
|
|
|
{0x0651, 0x0651, 0x0651, 0x0651}, // 0x0651 = shadda
|
|
|
|
|
{0x0652, 0x0652, 0x0652, 0x0652}, // 0x0652 = sukun
|
2007-05-31 18:53:01 +00:00
|
|
|
|
|
|
|
|
|
{0, 0, 0, 0}, // 0x0653
|
|
|
|
|
{0, 0, 0, 0}, // 0x0654
|
|
|
|
|
{0, 0, 0, 0}, // 0x0655
|
|
|
|
|
{0, 0, 0, 0}, // 0x0656
|
|
|
|
|
{0, 0, 0, 0}, // 0x0657
|
|
|
|
|
{0, 0, 0, 0}, // 0x0658
|
|
|
|
|
{0, 0, 0, 0}, // 0x0659
|
|
|
|
|
{0, 0, 0, 0}, // 0x065a
|
|
|
|
|
{0, 0, 0, 0}, // 0x065b
|
|
|
|
|
{0, 0, 0, 0}, // 0x065c
|
|
|
|
|
{0, 0, 0, 0}, // 0x065d
|
|
|
|
|
{0, 0, 0, 0}, // 0x065e
|
|
|
|
|
{0, 0, 0, 0}, // 0x065f
|
|
|
|
|
{0, 0, 0, 0}, // 0x0660
|
|
|
|
|
{0, 0, 0, 0}, // 0x0661
|
|
|
|
|
{0, 0, 0, 0}, // 0x0662
|
|
|
|
|
{0, 0, 0, 0}, // 0x0663
|
|
|
|
|
{0, 0, 0, 0}, // 0x0664
|
|
|
|
|
{0, 0, 0, 0}, // 0x0665
|
|
|
|
|
{0, 0, 0, 0}, // 0x0666
|
|
|
|
|
{0, 0, 0, 0}, // 0x0667
|
|
|
|
|
{0, 0, 0, 0}, // 0x0668
|
|
|
|
|
{0, 0, 0, 0}, // 0x0669
|
|
|
|
|
{0, 0, 0, 0}, // 0x066a
|
|
|
|
|
{0, 0, 0, 0}, // 0x066b
|
|
|
|
|
{0, 0, 0, 0}, // 0x066c
|
|
|
|
|
{0, 0, 0, 0}, // 0x066d
|
|
|
|
|
{0, 0, 0, 0}, // 0x066e
|
|
|
|
|
{0, 0, 0, 0}, // 0x066f
|
|
|
|
|
{0, 0, 0, 0}, // 0x0670
|
|
|
|
|
{0, 0, 0, 0}, // 0x0671
|
|
|
|
|
{0, 0, 0, 0}, // 0x0672
|
|
|
|
|
{0, 0, 0, 0}, // 0x0673
|
|
|
|
|
{0, 0, 0, 0}, // 0x0674
|
|
|
|
|
{0, 0, 0, 0}, // 0x0675
|
|
|
|
|
{0, 0, 0, 0}, // 0x0676
|
|
|
|
|
{0, 0, 0, 0}, // 0x0677
|
|
|
|
|
{0, 0, 0, 0}, // 0x0678
|
|
|
|
|
{0, 0, 0, 0}, // 0x0679
|
|
|
|
|
{0, 0, 0, 0}, // 0x067a
|
|
|
|
|
{0, 0, 0, 0}, // 0x067b
|
|
|
|
|
{0, 0, 0, 0}, // 0x067c
|
|
|
|
|
{0, 0, 0, 0}, // 0x067d
|
|
|
|
|
{0xfb56, 0xfb57, 0xfb58, 0xfb59}, // 0x067e = peh
|
|
|
|
|
{0, 0, 0, 0}, // 0x067f
|
|
|
|
|
{0, 0, 0, 0}, // 0x0680
|
|
|
|
|
{0, 0, 0, 0}, // 0x0681
|
|
|
|
|
{0, 0, 0, 0}, // 0x0682
|
|
|
|
|
{0, 0, 0, 0}, // 0x0683
|
|
|
|
|
{0, 0, 0, 0}, // 0x0684
|
|
|
|
|
{0, 0, 0, 0}, // 0x0685
|
|
|
|
|
{0xfb7a, 0xfb7b, 0xfb7c, 0xfb7d}, // 0x0686 = tcheh
|
|
|
|
|
{0, 0, 0, 0}, // 0x0687
|
|
|
|
|
{0, 0, 0, 0}, // 0x0688
|
|
|
|
|
{0, 0, 0, 0}, // 0x0689
|
|
|
|
|
{0, 0, 0, 0}, // 0x068a
|
|
|
|
|
{0, 0, 0, 0}, // 0x068b
|
|
|
|
|
{0, 0, 0, 0}, // 0x068c
|
|
|
|
|
{0, 0, 0, 0}, // 0x068d
|
|
|
|
|
{0, 0, 0, 0}, // 0x068e
|
|
|
|
|
{0, 0, 0, 0}, // 0x068f
|
|
|
|
|
{0, 0, 0, 0}, // 0x0690
|
|
|
|
|
{0, 0, 0, 0}, // 0x0691
|
|
|
|
|
{0, 0, 0, 0}, // 0x0692
|
|
|
|
|
{0, 0, 0, 0}, // 0x0693
|
|
|
|
|
{0, 0, 0, 0}, // 0x0694
|
|
|
|
|
{0, 0, 0, 0}, // 0x0695
|
|
|
|
|
{0, 0, 0, 0}, // 0x0696
|
|
|
|
|
{0, 0, 0, 0}, // 0x0697
|
|
|
|
|
{0xfb8a, 0xfb8b, 0xfb8a, 0xfb8b}, // 0x0698 = jeh
|
|
|
|
|
{0, 0, 0, 0}, // 0x0699
|
|
|
|
|
{0, 0, 0, 0}, // 0x069a
|
|
|
|
|
{0, 0, 0, 0}, // 0x069b
|
|
|
|
|
{0, 0, 0, 0}, // 0x069c
|
|
|
|
|
{0, 0, 0, 0}, // 0x069d
|
|
|
|
|
{0, 0, 0, 0}, // 0x069e
|
|
|
|
|
{0, 0, 0, 0}, // 0x069f
|
|
|
|
|
{0, 0, 0, 0}, // 0x06a0
|
|
|
|
|
{0, 0, 0, 0}, // 0x06a1
|
|
|
|
|
{0, 0, 0, 0}, // 0x06a2
|
|
|
|
|
{0, 0, 0, 0}, // 0x06a3
|
|
|
|
|
{0, 0, 0, 0}, // 0x06a4
|
|
|
|
|
{0, 0, 0, 0}, // 0x06a5
|
|
|
|
|
{0, 0, 0, 0}, // 0x06a6
|
|
|
|
|
{0, 0, 0, 0}, // 0x06a7
|
|
|
|
|
{0, 0, 0, 0}, // 0x06a8
|
|
|
|
|
{0xfb8e, 0xfb8f, 0xfb90, 0xfb91}, // 0x06a9 = farsi kaf
|
|
|
|
|
{0, 0, 0, 0}, // 0x06aa
|
|
|
|
|
{0, 0, 0, 0}, // 0x06ab
|
|
|
|
|
{0, 0, 0, 0}, // 0x06ac
|
|
|
|
|
{0, 0, 0, 0}, // 0x06ad
|
|
|
|
|
{0, 0, 0, 0}, // 0x06ae
|
|
|
|
|
{0xfb92, 0xfb93, 0xfb94, 0xfb95}, // 0x06af = gaf
|
|
|
|
|
{0, 0, 0, 0}, // 0x06b0
|
|
|
|
|
{0, 0, 0, 0}, // 0x06b1
|
|
|
|
|
{0, 0, 0, 0}, // 0x06b2
|
|
|
|
|
{0, 0, 0, 0}, // 0x06b3
|
|
|
|
|
{0, 0, 0, 0}, // 0x06b4
|
|
|
|
|
{0, 0, 0, 0}, // 0x06b5
|
|
|
|
|
{0, 0, 0, 0}, // 0x06b6
|
|
|
|
|
{0, 0, 0, 0}, // 0x06b7
|
|
|
|
|
{0, 0, 0, 0}, // 0x06b8
|
|
|
|
|
{0, 0, 0, 0}, // 0x06b9
|
|
|
|
|
{0, 0, 0, 0}, // 0x06ba
|
|
|
|
|
{0, 0, 0, 0}, // 0x06bb
|
|
|
|
|
{0, 0, 0, 0}, // 0x06bc
|
|
|
|
|
{0, 0, 0, 0}, // 0x06bd
|
|
|
|
|
{0, 0, 0, 0}, // 0x06be
|
|
|
|
|
{0, 0, 0, 0}, // 0x06bf
|
|
|
|
|
{0, 0, 0, 0}, // 0x06c0
|
|
|
|
|
{0, 0, 0, 0}, // 0x06c1
|
|
|
|
|
{0, 0, 0, 0}, // 0x06c2
|
|
|
|
|
{0, 0, 0, 0}, // 0x06c3
|
|
|
|
|
{0, 0, 0, 0}, // 0x06c4
|
|
|
|
|
{0, 0, 0, 0}, // 0x06c5
|
|
|
|
|
{0, 0, 0, 0}, // 0x06c6
|
|
|
|
|
{0, 0, 0, 0}, // 0x06c7
|
|
|
|
|
{0, 0, 0, 0}, // 0x06c8
|
|
|
|
|
{0, 0, 0, 0}, // 0x06c9
|
|
|
|
|
{0, 0, 0, 0}, // 0x06ca
|
|
|
|
|
{0, 0, 0, 0}, // 0x06cb
|
|
|
|
|
{0xfbfc, 0xfbfd, 0xfbfe, 0xfbff} // 0x06cc = farsi yeh
|
2000-07-04 20:32:37 +00:00
|
|
|
|
};
|
|
|
|
|
|
2000-07-24 21:49:58 +00:00
|
|
|
|
|
2007-03-24 21:12:29 +00:00
|
|
|
|
char_type const arabic_start = 0x0621;
|
2007-05-31 18:53:01 +00:00
|
|
|
|
char_type const arabic_end = 0x06cc;
|
2001-03-20 01:22:46 +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
|
|
|
|
|
|
|
|
|
/// Information about a single UCS4 character
|
|
|
|
|
struct CharInfo {
|
2008-06-02 01:35:42 +00:00
|
|
|
|
/// LaTeX command (text mode) for this character
|
|
|
|
|
docstring textcommand;
|
|
|
|
|
/// LaTeX command (math mode) for this character
|
|
|
|
|
docstring mathcommand;
|
|
|
|
|
/// Needed LaTeX preamble (or feature) for text mode
|
|
|
|
|
string textpreamble;
|
|
|
|
|
/// Needed LaTeX preamble (or feature) for math mode
|
|
|
|
|
string mathpreamble;
|
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
|
|
|
|
/// Is this a combining character?
|
|
|
|
|
bool combining;
|
2008-06-02 01:35:42 +00:00
|
|
|
|
/// Is \c textpreamble a feature known by LaTeXFeatures, or a raw LaTeX
|
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
|
|
|
|
/// command?
|
2008-06-02 01:35:42 +00:00
|
|
|
|
bool textfeature;
|
|
|
|
|
/// Is \c mathpreamble a feature known by LaTeXFeatures, or a raw LaTeX
|
|
|
|
|
/// command?
|
|
|
|
|
bool mathfeature;
|
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
|
|
|
|
/// Always force the LaTeX command, even if the encoding contains
|
|
|
|
|
/// this character?
|
|
|
|
|
bool force;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
2008-06-23 18:00:43 +00:00
|
|
|
|
typedef std::set<char_type> CharSet;
|
|
|
|
|
CharSet forced;
|
|
|
|
|
|
2008-09-26 15:53:15 +00:00
|
|
|
|
typedef std::set<char_type> MathAlphaSet;
|
|
|
|
|
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;
|
|
|
|
|
|
2001-03-20 01:22:46 +00:00
|
|
|
|
} // namespace anon
|
|
|
|
|
|
|
|
|
|
|
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";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-11 08:56:17 +00:00
|
|
|
|
Encoding::Encoding(string const & n, string const & l, string const & g,
|
|
|
|
|
string const & i, bool f, Encoding::Package p)
|
|
|
|
|
: name_(n), latexName_(l), guiName_(g), iconvName_(i), fixedwidth_(f), 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 {
|
|
|
|
|
complete_ = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void Encoding::init() const
|
|
|
|
|
{
|
2008-02-08 18:12:52 +00:00
|
|
|
|
if (complete_)
|
|
|
|
|
return;
|
|
|
|
|
|
2007-05-06 20:26:02 +00:00
|
|
|
|
start_encodable_ = 0;
|
|
|
|
|
// 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);
|
|
|
|
|
if (it == unicodesymbols.end() || !it->second.force)
|
|
|
|
|
encodable_.insert(uc);
|
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);
|
|
|
|
|
if (it == unicodesymbols.end() || !it->second.force)
|
|
|
|
|
encodable_.insert(c);
|
|
|
|
|
}
|
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();
|
|
|
|
|
CharSet::iterator it = encodable_.find(start_encodable_);
|
|
|
|
|
while (it != encodable_.end()) {
|
|
|
|
|
encodable_.erase(it);
|
|
|
|
|
++start_encodable_;
|
|
|
|
|
it = encodable_.find(start_encodable_);
|
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-20 01:50:54 +00:00
|
|
|
|
docstring Encoding::latexChar(char_type c, bool for_mathed) 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)
|
|
|
|
|
return docstring(1, c);
|
|
|
|
|
if (c < start_encodable_ && !encodings.isForced(c))
|
2008-06-02 01:35:42 +00:00
|
|
|
|
return docstring(1, c);
|
|
|
|
|
if (encodable_.find(c) != encodable_.end())
|
|
|
|
|
return docstring(1, c);
|
2008-07-20 01:50:54 +00:00
|
|
|
|
if (for_mathed)
|
|
|
|
|
return docstring();
|
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
|
|
|
|
|
if (it->second.textcommand.empty())
|
|
|
|
|
return "\\ensuremath{" + it->second.mathcommand + '}';
|
|
|
|
|
return it->second.textcommand;
|
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-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
|
|
|
|
|
|
|
|
|
// first all encodable characters
|
2008-03-21 21:08:57 +00:00
|
|
|
|
vector<char_type> symbols(encodable_.begin(), encodable_.end());
|
2008-02-07 13:18:07 +00:00
|
|
|
|
// add those below start_encodable_
|
|
|
|
|
for (char_type c = 0; c < start_encodable_; ++c)
|
2008-03-21 21:08:57 +00:00
|
|
|
|
symbols.push_back(c);
|
2008-02-07 13:18:07 +00:00
|
|
|
|
// now the ones from the unicodesymbols file
|
|
|
|
|
CharInfoMap::const_iterator const end = unicodesymbols.end();
|
2008-02-08 18:02:27 +00:00
|
|
|
|
CharInfoMap::const_iterator it = unicodesymbols.begin();
|
|
|
|
|
for (; it != end; ++it)
|
2008-03-21 21:08:57 +00:00
|
|
|
|
symbols.push_back(it->first);
|
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,
|
|
|
|
|
Encoding const * encoding, docstring & command)
|
2008-06-02 01:35:42 +00:00
|
|
|
|
{
|
2008-09-25 18:38:25 +00:00
|
|
|
|
if (encoding)
|
2008-07-20 01:50:54 +00:00
|
|
|
|
command = encoding->latexChar(c, true);
|
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
|
|
|
|
|
bool use_math = (mathmode && !it->second.mathcommand.empty()) ||
|
|
|
|
|
(!mathmode && it->second.textcommand.empty());
|
|
|
|
|
if (use_math) {
|
|
|
|
|
command = it->second.mathcommand;
|
|
|
|
|
addMathCmd(c);
|
|
|
|
|
} else {
|
|
|
|
|
if (!encoding || command.empty()) {
|
|
|
|
|
command = it->second.textcommand;
|
|
|
|
|
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
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-06-16 01:21:17 +00:00
|
|
|
|
char_type Encodings::fromLaTeXCommand(docstring const & cmd, bool & combining)
|
|
|
|
|
{
|
|
|
|
|
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) {
|
2008-06-16 01:21:17 +00:00
|
|
|
|
docstring const math = it->second.mathcommand;
|
|
|
|
|
docstring const text = it->second.textcommand;
|
|
|
|
|
if (math == cmd || text == cmd) {
|
|
|
|
|
combining = it->second.combining;
|
|
|
|
|
return it->first;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem)
|
|
|
|
|
{
|
|
|
|
|
docstring symbols;
|
|
|
|
|
size_t i = 0;
|
|
|
|
|
size_t const cmdend = cmd.size();
|
|
|
|
|
CharInfoMap::const_iterator const uniend = unicodesymbols.end();
|
|
|
|
|
for (size_t j = 0; j < cmdend; ++j) {
|
|
|
|
|
// Also get the char after a backslash
|
|
|
|
|
if (j + 1 < cmdend && cmd[j] == '\\')
|
|
|
|
|
++j;
|
|
|
|
|
// If a macro argument follows, get it, too
|
|
|
|
|
if (j + 1 < cmdend && cmd[j + 1] == '{') {
|
|
|
|
|
size_t k = j + 1;
|
|
|
|
|
int count = 1;
|
|
|
|
|
while (k < cmdend && count && k != docstring::npos) {
|
|
|
|
|
k = cmd.find_first_of(from_ascii("{}"), k + 1);
|
|
|
|
|
if (cmd[k] == '{')
|
|
|
|
|
++count;
|
|
|
|
|
else
|
|
|
|
|
--count;
|
|
|
|
|
}
|
|
|
|
|
if (k != docstring::npos)
|
|
|
|
|
j = k;
|
|
|
|
|
}
|
|
|
|
|
// Start with this substring and try augmenting it when it is
|
|
|
|
|
// the prefix of some command in the unicodesymbols file
|
|
|
|
|
docstring const subcmd = cmd.substr(i, j - i + 1);
|
|
|
|
|
|
|
|
|
|
CharInfoMap::const_iterator it = unicodesymbols.begin();
|
|
|
|
|
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) {
|
|
|
|
|
docstring const math = it->second.mathcommand;
|
|
|
|
|
docstring const text = it->second.textcommand;
|
|
|
|
|
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 13:01:56 +00:00
|
|
|
|
// matching entry in the unicodesymbols file.
|
|
|
|
|
// 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,
|
|
|
|
|
// or what follows is a nonletter char.
|
|
|
|
|
if ((math == tmp || text == tmp)
|
|
|
|
|
&& (tmp[0] != '\\'
|
|
|
|
|
|| (tmp.size() == 2 && !isAlphaASCII(tmp[1]))
|
|
|
|
|
|| k == cmdend || !isAlphaASCII(cmd[k]))) {
|
2008-06-16 01:21:17 +00:00
|
|
|
|
c = it->first;
|
|
|
|
|
j = k - 1;
|
|
|
|
|
i = j + 1;
|
|
|
|
|
unicmd_size = cur_size;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (unicmd_size)
|
|
|
|
|
symbols += c;
|
|
|
|
|
else if (j + 1 == cmdend)
|
|
|
|
|
// No luck. Return what remains
|
|
|
|
|
rem = cmd.substr(i);
|
|
|
|
|
}
|
|
|
|
|
return symbols;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-09-26 15:53:15 +00:00
|
|
|
|
void Encodings::initUnicodeMath(Buffer const & buffer)
|
|
|
|
|
{
|
|
|
|
|
mathcmd.clear();
|
|
|
|
|
textcmd.clear();
|
|
|
|
|
mathsym.clear();
|
|
|
|
|
|
|
|
|
|
Inset & inset = buffer.inset();
|
|
|
|
|
InsetIterator it = inset_iterator_begin(inset);
|
|
|
|
|
InsetIterator const end = inset_iterator_end(inset);
|
|
|
|
|
|
|
|
|
|
for (; it != end; ++it)
|
|
|
|
|
it->initUnicodeMath();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-06-02 01:35:42 +00:00
|
|
|
|
void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
|
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::const_iterator const it = unicodesymbols.find(c);
|
2008-06-02 01:35:42 +00:00
|
|
|
|
if (it != unicodesymbols.end()) {
|
2008-09-25 18:38:25 +00:00
|
|
|
|
// In mathed, c could be used both in textmode and mathmode
|
|
|
|
|
bool const use_math = (for_mathed && isMathCmd(c)) ||
|
2008-06-02 01:35:42 +00:00
|
|
|
|
(!for_mathed && it->second.textcommand.empty());
|
2008-09-25 18:38:25 +00:00
|
|
|
|
bool const use_text = (for_mathed && isTextCmd(c)) ||
|
|
|
|
|
(!for_mathed && !it->second.textcommand.empty());
|
2008-06-02 01:35:42 +00:00
|
|
|
|
if (use_math) {
|
|
|
|
|
if (!it->second.mathpreamble.empty()) {
|
2008-09-26 15:53:15 +00:00
|
|
|
|
if (it->second.mathfeature) {
|
|
|
|
|
string feats = it->second.mathpreamble;
|
|
|
|
|
while (!feats.empty()) {
|
|
|
|
|
string feat;
|
|
|
|
|
feats = split(feats, feat, ',');
|
|
|
|
|
features.require(feat);
|
|
|
|
|
}
|
|
|
|
|
} else
|
2008-06-02 01:35:42 +00:00
|
|
|
|
features.addPreambleSnippet(it->second.mathpreamble);
|
|
|
|
|
}
|
2008-09-25 18:38:25 +00:00
|
|
|
|
}
|
|
|
|
|
if (use_text) {
|
2008-06-02 01:35:42 +00:00
|
|
|
|
if (!it->second.textpreamble.empty()) {
|
2008-09-26 15:53:15 +00:00
|
|
|
|
if (it->second.textfeature) {
|
|
|
|
|
string feats = it->second.textpreamble;
|
|
|
|
|
while (!feats.empty()) {
|
|
|
|
|
string feat;
|
|
|
|
|
feats = split(feats, feat, ',');
|
|
|
|
|
features.require(feat);
|
|
|
|
|
}
|
|
|
|
|
} else
|
2008-06-02 01:35:42 +00:00
|
|
|
|
features.addPreambleSnippet(it->second.textpreamble);
|
|
|
|
|
}
|
|
|
|
|
}
|
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-09-25 18:38:25 +00:00
|
|
|
|
if (for_mathed && isMathSym(c)) {
|
|
|
|
|
features.require("relsize");
|
|
|
|
|
features.require("lyxmathsym");
|
|
|
|
|
}
|
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
|
|
|
|
}
|
|
|
|
|
|
2006-10-22 10:15:23 +00:00
|
|
|
|
|
2008-03-21 21:47:37 +00:00
|
|
|
|
bool Encodings::isHebrewComposeChar(char_type c)
|
2000-07-24 21:49:58 +00:00
|
|
|
|
{
|
2008-02-08 18:25:10 +00:00
|
|
|
|
return c <= 0x05c2 && c >= 0x05b0 && c != 0x05be && c != 0x05c0;
|
2000-07-24 21:49:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-11-25 21:29:21 +00:00
|
|
|
|
// Special Arabic letters are ones that do not get connected from left
|
2002-12-01 22:59:25 +00:00
|
|
|
|
// they are hamza, alef_madda, alef_hamza, waw_hamza, alef_hamza_under,
|
2002-11-25 21:29:21 +00:00
|
|
|
|
// alef, tah_marbota, dal, thal, rah, zai, wow, alef_maksoura
|
|
|
|
|
|
2008-03-21 21:47:37 +00:00
|
|
|
|
bool Encodings::isArabicSpecialChar(char_type c)
|
2002-11-25 21:29:21 +00:00
|
|
|
|
{
|
2008-02-08 18:25:10 +00:00
|
|
|
|
return (c >= 0x0621 && c <= 0x0625) || (c >= 0x0630 && c <= 0x0632)
|
|
|
|
|
|| c == 0x0627 || c == 0x0629 || c == 0x062f || c == 0x0648
|
|
|
|
|
|| c == 0x0649 || c == 0x0698;
|
2002-11-25 21:29:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-03-24 21:12:29 +00:00
|
|
|
|
|
2008-03-21 21:47:37 +00:00
|
|
|
|
bool Encodings::isArabicComposeChar(char_type c)
|
2000-07-24 21:49:58 +00:00
|
|
|
|
{
|
2007-03-24 21:12:29 +00:00
|
|
|
|
return c >= 0x064b && c <= 0x0652;
|
2000-07-24 21:49:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-03-21 21:47:37 +00:00
|
|
|
|
bool Encodings::isArabicChar(char_type c)
|
2000-07-24 21:49:58 +00:00
|
|
|
|
{
|
2008-02-08 18:25:10 +00:00
|
|
|
|
return c >= arabic_start && c <= arabic_end
|
|
|
|
|
&& arabic_table[c-arabic_start][0];
|
2000-07-24 21:49:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-03-21 21:47:37 +00:00
|
|
|
|
char_type Encodings::transformChar(char_type c, Encodings::LetterForm form)
|
2000-07-24 21:49:58 +00:00
|
|
|
|
{
|
2008-03-21 21:47:37 +00:00
|
|
|
|
return isArabicChar(c) ? arabic_table[c-arabic_start][form] : c;
|
2000-07-24 21:49:58 +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
|
|
|
|
bool Encodings::isCombiningChar(char_type c)
|
|
|
|
|
{
|
|
|
|
|
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
|
|
|
|
|
if (it != unicodesymbols.end())
|
|
|
|
|
return it->second.combining;
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-10-24 17:22:57 +00:00
|
|
|
|
bool Encodings::isKnownScriptChar(char_type const c, string & preamble)
|
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())
|
|
|
|
|
return false;
|
|
|
|
|
|
2008-06-02 01:35:42 +00:00
|
|
|
|
if (it->second.textpreamble != "textgreek" && it->second.textpreamble != "textcyr")
|
2007-10-15 13:04:53 +00:00
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
if (preamble.empty()) {
|
2008-06-02 01:35:42 +00:00
|
|
|
|
preamble = it->second.textpreamble;
|
2007-10-15 13:04:53 +00:00
|
|
|
|
return true;
|
2007-10-12 18:21:51 +00:00
|
|
|
|
}
|
2008-06-02 01:35:42 +00:00
|
|
|
|
return it->second.textpreamble == preamble;
|
2007-10-12 18:21:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-06-23 18:00:43 +00:00
|
|
|
|
bool Encodings::isForced(char_type c)
|
|
|
|
|
{
|
|
|
|
|
return (!forced.empty() && forced.find(c) != forced.end());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-09-26 15:53:15 +00:00
|
|
|
|
bool Encodings::isMathAlpha(char_type c)
|
|
|
|
|
{
|
|
|
|
|
return mathalpha.count(c);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-03-21 21:47:37 +00:00
|
|
|
|
Encoding const * Encodings::fromLyXName(string const & name) 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);
|
|
|
|
|
return it != encodinglist.end() ? &it->second : 0;
|
2000-10-10 12:36:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-03 10:35:41 +00:00
|
|
|
|
|
2008-03-21 21:47:37 +00:00
|
|
|
|
Encoding const * Encodings::fromLaTeXName(string const & name) const
|
2006-11-03 10:35:41 +00:00
|
|
|
|
{
|
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)
|
|
|
|
|
if (it->second.latexName() == name)
|
|
|
|
|
return &it->second;
|
|
|
|
|
return 0;
|
2006-11-03 10:35:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2000-10-10 12:36:36 +00:00
|
|
|
|
Encodings::Encodings()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
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.
|
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;
|
|
|
|
|
CharInfo info;
|
|
|
|
|
string flags;
|
|
|
|
|
|
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;
|
2008-06-02 01:35:42 +00:00
|
|
|
|
info.textcommand = symbolslex.getDocString();
|
2008-02-08 18:25:10 +00:00
|
|
|
|
if (!symbolslex.next(true))
|
|
|
|
|
break;
|
2008-06-02 01:35:42 +00:00
|
|
|
|
info.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;
|
2008-02-08 18:25:10 +00:00
|
|
|
|
flags = symbolslex.getString();
|
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
|
|
|
|
|
|
|
|
|
info.combining = false;
|
2008-06-02 01:35:42 +00:00
|
|
|
|
info.textfeature = false;
|
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
|
|
|
|
info.force = false;
|
|
|
|
|
while (!flags.empty()) {
|
|
|
|
|
string flag;
|
2007-12-12 19:57:42 +00:00
|
|
|
|
flags = split(flags, flag, ',');
|
2008-09-26 15:53:15 +00:00
|
|
|
|
if (flag == "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
|
|
|
|
info.combining = true;
|
2008-09-26 15:53:15 +00:00
|
|
|
|
} else if (flag == "force") {
|
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
|
|
|
|
info.force = true;
|
2008-06-23 18:00:43 +00:00
|
|
|
|
forced.insert(symbol);
|
2008-09-26 15:53:15 +00:00
|
|
|
|
} else if (flag == "mathalpha") {
|
|
|
|
|
mathalpha.insert(symbol);
|
|
|
|
|
} 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;
|
|
|
|
|
if (symbolslex.next(true)) {
|
|
|
|
|
if (symbolslex.lineNumber() != lineno) {
|
|
|
|
|
// line in old format without mathcommand and mathpreamble
|
|
|
|
|
getNextToken = false;
|
|
|
|
|
} else {
|
|
|
|
|
info.mathcommand = symbolslex.getDocString();
|
|
|
|
|
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
|
|
|
|
|
info.mathpreamble = symbolslex.getString();
|
|
|
|
|
}
|
|
|
|
|
} 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
|
|
|
|
|
2008-06-02 01:35:42 +00:00
|
|
|
|
if (!info.textpreamble.empty())
|
|
|
|
|
info.textfeature = info.textpreamble[0] != '\\';
|
|
|
|
|
if (!info.mathpreamble.empty())
|
|
|
|
|
info.mathfeature = info.mathpreamble[0] != '\\';
|
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-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::INFO, "Read unicode symbol " << symbol << " '"
|
2008-06-02 01:35:42 +00:00
|
|
|
|
<< to_utf8(info.textcommand) << "' '" << info.textpreamble
|
|
|
|
|
<< "' " << info.combining << ' ' << info.textfeature
|
|
|
|
|
<< " '" << to_utf8(info.mathcommand) << "' '"
|
|
|
|
|
<< info.mathpreamble << "' " << info.mathfeature);
|
|
|
|
|
|
|
|
|
|
// we assume that at least one command is nonempty when using unicodesymbols
|
|
|
|
|
if (!info.textcommand.empty() || !info.mathcommand.empty())
|
|
|
|
|
unicodesymbols[symbol] = info;
|
|
|
|
|
|
|
|
|
|
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,
|
|
|
|
|
et_end,
|
|
|
|
|
};
|
|
|
|
|
|
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;
|
2007-05-06 20:26:02 +00:00
|
|
|
|
if (width == "fixed")
|
|
|
|
|
fixedwidth = true;
|
|
|
|
|
else if (width == "variable")
|
|
|
|
|
fixedwidth = false;
|
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,
|
2008-07-11 08:56:17 +00:00
|
|
|
|
guiname, iconvname, fixedwidth, 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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace lyx
|