mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
the greek-insert stuff, incidently containing unrelated the removal of paragraph_pimpl.C
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17972 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz
parent
2dcd61cc9c
commit
a3828f81ee
@ -180,6 +180,7 @@ void LyXAction::init()
|
||||
{ LFUN_FONT_STATE, "font-state", ReadOnly },
|
||||
{ LFUN_FONT_UNDERLINE, "font-underline", Noop },
|
||||
{ LFUN_FOOTNOTE_INSERT, "footnote-insert", Noop },
|
||||
{ LFUN_GREEK_INSERT, "greek-insert", Noop },
|
||||
{ LFUN_HFILL_INSERT, "hfill-insert", Noop },
|
||||
{ LFUN_HELP_OPEN, "help-open", NoBuffer | Argument},
|
||||
{ LFUN_HTML_INSERT, "html-insert", Noop },
|
||||
|
||||
@ -375,11 +375,12 @@ enum kb_action {
|
||||
// 285
|
||||
LFUN_BOOKMARK_CLEAR, // bpeng 20061031
|
||||
LFUN_TOOLBAR_TOGGLE_STATE, // bpeng 20061101
|
||||
LFUN_NOMENCL_INSERT, // Ugras
|
||||
LFUN_NOMENCL_PRINT, // Ugras
|
||||
LFUN_NOMENCL_INSERT, // Ugras
|
||||
LFUN_NOMENCL_PRINT, // Ugras
|
||||
LFUN_CLEARPAGE_INSERT, // Ugras 20061125
|
||||
//290
|
||||
LFUN_CLEARDOUBLEPAGE_INSERT, // ugras 20061125
|
||||
LFUN_CLEARDOUBLEPAGE_INSERT, // Ugras 20061125
|
||||
LFUN_GREEK_INSERT, // André 20070402
|
||||
|
||||
LFUN_LASTACTION // end of the table
|
||||
};
|
||||
|
||||
@ -1,837 +0,0 @@
|
||||
/**
|
||||
* \file paragraph_pimpl.C
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author Lars Gullik Bjønnes
|
||||
* \author Jean-Marc Lasgouttes
|
||||
* \author John Levon
|
||||
* \author André Pönitz
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "paragraph_pimpl.h"
|
||||
#include "paragraph.h"
|
||||
|
||||
#include "bufferparams.h"
|
||||
#include "debug.h"
|
||||
#include "encoding.h"
|
||||
#include "language.h"
|
||||
#include "LaTeXFeatures.h"
|
||||
#include "LColor.h"
|
||||
#include "lyxlength.h"
|
||||
#include "lyxrc.h"
|
||||
#include "outputparams.h"
|
||||
#include "texrow.h"
|
||||
|
||||
#include <boost/next_prior.hpp>
|
||||
|
||||
|
||||
namespace lyx {
|
||||
|
||||
using std::endl;
|
||||
using std::upper_bound;
|
||||
using std::lower_bound;
|
||||
using std::string;
|
||||
|
||||
|
||||
// Initialization of the counter for the paragraph id's,
|
||||
unsigned int Paragraph::Pimpl::paragraph_id = 0;
|
||||
|
||||
namespace {
|
||||
|
||||
struct special_phrase {
|
||||
string phrase;
|
||||
docstring macro;
|
||||
bool builtin;
|
||||
};
|
||||
|
||||
special_phrase const special_phrases[] = {
|
||||
{ "LyX", from_ascii("\\LyX{}"), false },
|
||||
{ "TeX", from_ascii("\\TeX{}"), true },
|
||||
{ "LaTeX2e", from_ascii("\\LaTeXe{}"), true },
|
||||
{ "LaTeX", from_ascii("\\LaTeX{}"), true },
|
||||
};
|
||||
|
||||
size_t const phrases_nr = sizeof(special_phrases)/sizeof(special_phrase);
|
||||
|
||||
} // namespace anon
|
||||
|
||||
|
||||
Paragraph::Pimpl::Pimpl(Paragraph * owner)
|
||||
: owner_(owner)
|
||||
{
|
||||
inset_owner = 0;
|
||||
id_ = paragraph_id++;
|
||||
}
|
||||
|
||||
|
||||
Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner)
|
||||
: params(p.params), changes_(p.changes_), owner_(owner)
|
||||
{
|
||||
inset_owner = p.inset_owner;
|
||||
fontlist = p.fontlist;
|
||||
id_ = paragraph_id++;
|
||||
}
|
||||
|
||||
|
||||
bool Paragraph::Pimpl::isChanged(pos_type start, pos_type end) const
|
||||
{
|
||||
BOOST_ASSERT(start >= 0 && start <= size());
|
||||
BOOST_ASSERT(end > start && end <= size() + 1);
|
||||
|
||||
return changes_.isChanged(start, end);
|
||||
}
|
||||
|
||||
|
||||
bool Paragraph::Pimpl::isMergedOnEndOfParDeletion(bool trackChanges) const {
|
||||
// keep the logic here in sync with the logic of eraseChars()
|
||||
|
||||
if (!trackChanges) {
|
||||
return true;
|
||||
}
|
||||
|
||||
Change change = changes_.lookup(size());
|
||||
|
||||
return change.type == Change::INSERTED && change.author == 0;
|
||||
}
|
||||
|
||||
|
||||
void Paragraph::Pimpl::setChange(Change const & change)
|
||||
{
|
||||
// beware of the imaginary end-of-par character!
|
||||
changes_.set(change, 0, size() + 1);
|
||||
|
||||
/*
|
||||
* Propagate the change recursively - but not in case of DELETED!
|
||||
*
|
||||
* Imagine that your co-author makes changes in an existing inset. He
|
||||
* sends your document to you and you come to the conclusion that the
|
||||
* inset should go completely. If you erase it, LyX must not delete all
|
||||
* text within the inset. Otherwise, the change tracked insertions of
|
||||
* your co-author get lost and there is no way to restore them later.
|
||||
*
|
||||
* Conclusion: An inset's content should remain untouched if you delete it
|
||||
*/
|
||||
|
||||
if (change.type != Change::DELETED) {
|
||||
for (pos_type pos = 0; pos < size(); ++pos) {
|
||||
if (owner_->isInset(pos)) {
|
||||
owner_->getInset(pos)->setChange(change);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Paragraph::Pimpl::setChange(pos_type pos, Change const & change)
|
||||
{
|
||||
BOOST_ASSERT(pos >= 0 && pos <= size());
|
||||
|
||||
changes_.set(change, pos);
|
||||
|
||||
// see comment in setChange(Change const &) above
|
||||
|
||||
if (change.type != Change::DELETED &&
|
||||
pos < size() && owner_->isInset(pos)) {
|
||||
owner_->getInset(pos)->setChange(change);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Change const & Paragraph::Pimpl::lookupChange(pos_type pos) const
|
||||
{
|
||||
BOOST_ASSERT(pos >= 0 && pos <= size());
|
||||
|
||||
return changes_.lookup(pos);
|
||||
}
|
||||
|
||||
|
||||
void Paragraph::Pimpl::acceptChanges(BufferParams const & bparams, pos_type start, pos_type end)
|
||||
{
|
||||
BOOST_ASSERT(start >= 0 && start <= size());
|
||||
BOOST_ASSERT(end > start && end <= size() + 1);
|
||||
|
||||
for (pos_type pos = start; pos < end; ++pos) {
|
||||
switch (lookupChange(pos).type) {
|
||||
case Change::UNCHANGED:
|
||||
// accept changes in nested inset
|
||||
if (pos < size() && owner_->isInset(pos)) {
|
||||
owner_->getInset(pos)->acceptChanges(bparams);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case Change::INSERTED:
|
||||
changes_.set(Change(Change::UNCHANGED), pos);
|
||||
// also accept changes in nested inset
|
||||
if (pos < size() && owner_->isInset(pos)) {
|
||||
owner_->getInset(pos)->acceptChanges(bparams);
|
||||
}
|
||||
break;
|
||||
|
||||
case Change::DELETED:
|
||||
// Suppress access to non-existent
|
||||
// "end-of-paragraph char"
|
||||
if (pos < size()) {
|
||||
eraseChar(pos, false);
|
||||
--end;
|
||||
--pos;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Paragraph::Pimpl::rejectChanges(BufferParams const & bparams, pos_type start, pos_type end)
|
||||
{
|
||||
BOOST_ASSERT(start >= 0 && start <= size());
|
||||
BOOST_ASSERT(end > start && end <= size() + 1);
|
||||
|
||||
for (pos_type pos = start; pos < end; ++pos) {
|
||||
switch (lookupChange(pos).type) {
|
||||
case Change::UNCHANGED:
|
||||
// reject changes in nested inset
|
||||
if (pos < size() && owner_->isInset(pos)) {
|
||||
owner_->getInset(pos)->rejectChanges(bparams);
|
||||
}
|
||||
break;
|
||||
|
||||
case Change::INSERTED:
|
||||
// Suppress access to non-existent
|
||||
// "end-of-paragraph char"
|
||||
if (pos < size()) {
|
||||
eraseChar(pos, false);
|
||||
--end;
|
||||
--pos;
|
||||
}
|
||||
break;
|
||||
|
||||
case Change::DELETED:
|
||||
changes_.set(Change(Change::UNCHANGED), pos);
|
||||
|
||||
// Do NOT reject changes within a deleted inset!
|
||||
// There may be insertions of a co-author inside of it!
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
|
||||
{
|
||||
BOOST_ASSERT(pos >= 0 && pos <= size());
|
||||
|
||||
return owner_->getChar(pos);
|
||||
}
|
||||
|
||||
|
||||
void Paragraph::Pimpl::insertChar(pos_type pos, value_type c, Change const & change)
|
||||
{
|
||||
BOOST_ASSERT(pos >= 0 && pos <= size());
|
||||
|
||||
// track change
|
||||
changes_.insert(change, pos);
|
||||
|
||||
// This is actually very common when parsing buffers (and
|
||||
// maybe inserting ascii text)
|
||||
if (pos == size()) {
|
||||
// when appending characters, no need to update tables
|
||||
owner_->text_.push_back(c);
|
||||
return;
|
||||
}
|
||||
|
||||
owner_->text_.insert(owner_->text_.begin() + pos, c);
|
||||
|
||||
// Update the font table.
|
||||
FontTable search_font(pos, LyXFont());
|
||||
for (FontList::iterator it
|
||||
= lower_bound(fontlist.begin(), fontlist.end(), search_font, matchFT());
|
||||
it != fontlist.end(); ++it)
|
||||
{
|
||||
it->pos(it->pos() + 1);
|
||||
}
|
||||
|
||||
// Update the insets
|
||||
owner_->insetlist.increasePosAfterPos(pos);
|
||||
}
|
||||
|
||||
|
||||
void Paragraph::Pimpl::insertInset(pos_type pos, InsetBase * inset,
|
||||
Change const & change)
|
||||
{
|
||||
BOOST_ASSERT(inset);
|
||||
BOOST_ASSERT(pos >= 0 && pos <= size());
|
||||
|
||||
insertChar(pos, META_INSET, change);
|
||||
BOOST_ASSERT(owner_->text_[pos] == META_INSET);
|
||||
|
||||
// Add a new entry in the insetlist.
|
||||
owner_->insetlist.insert(inset, pos);
|
||||
}
|
||||
|
||||
|
||||
bool Paragraph::Pimpl::eraseChar(pos_type pos, bool trackChanges)
|
||||
{
|
||||
BOOST_ASSERT(pos >= 0 && pos <= size());
|
||||
|
||||
// keep the logic here in sync with the logic of isMergedOnEndOfParDeletion()
|
||||
|
||||
if (trackChanges) {
|
||||
Change change = changes_.lookup(pos);
|
||||
|
||||
// set the character to DELETED if
|
||||
// a) it was previously unchanged or
|
||||
// b) it was inserted by a co-author
|
||||
|
||||
if (change.type == Change::UNCHANGED ||
|
||||
(change.type == Change::INSERTED && change.author != 0)) {
|
||||
setChange(pos, Change(Change::DELETED));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (change.type == Change::DELETED)
|
||||
return false;
|
||||
}
|
||||
|
||||
// Don't physically access the imaginary end-of-paragraph character.
|
||||
// eraseChar() can only mark it as DELETED. A physical deletion of
|
||||
// end-of-par must be handled externally.
|
||||
if (pos == size()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// track change
|
||||
changes_.erase(pos);
|
||||
|
||||
// if it is an inset, delete the inset entry
|
||||
if (owner_->text_[pos] == Paragraph::META_INSET) {
|
||||
owner_->insetlist.erase(pos);
|
||||
}
|
||||
|
||||
owner_->text_.erase(owner_->text_.begin() + pos);
|
||||
|
||||
// Erase entries in the tables.
|
||||
FontTable search_font(pos, LyXFont());
|
||||
|
||||
FontList::iterator it =
|
||||
lower_bound(fontlist.begin(),
|
||||
fontlist.end(),
|
||||
search_font, matchFT());
|
||||
if (it != fontlist.end() && it->pos() == pos &&
|
||||
(pos == 0 ||
|
||||
(it != fontlist.begin()
|
||||
&& boost::prior(it)->pos() == pos - 1))) {
|
||||
// If it is a multi-character font
|
||||
// entry, we just make it smaller
|
||||
// (see update below), otherwise we
|
||||
// should delete it.
|
||||
unsigned int const i = it - fontlist.begin();
|
||||
fontlist.erase(fontlist.begin() + i);
|
||||
it = fontlist.begin() + i;
|
||||
if (i > 0 && i < fontlist.size() &&
|
||||
fontlist[i - 1].font() == fontlist[i].font()) {
|
||||
fontlist.erase(fontlist.begin() + i - 1);
|
||||
it = fontlist.begin() + i - 1;
|
||||
}
|
||||
}
|
||||
|
||||
// Update all other entries
|
||||
FontList::iterator fend = fontlist.end();
|
||||
for (; it != fend; ++it)
|
||||
it->pos(it->pos() - 1);
|
||||
|
||||
// Update the insetlist
|
||||
owner_->insetlist.decreasePosAfterPos(pos);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
int Paragraph::Pimpl::eraseChars(pos_type start, pos_type end, bool trackChanges)
|
||||
{
|
||||
BOOST_ASSERT(start >= 0 && start <= size());
|
||||
BOOST_ASSERT(end >= start && end <= size() + 1);
|
||||
|
||||
pos_type i = start;
|
||||
for (pos_type count = end - start; count; --count) {
|
||||
if (!eraseChar(i, trackChanges))
|
||||
++i;
|
||||
}
|
||||
return end - i;
|
||||
}
|
||||
|
||||
|
||||
int Paragraph::Pimpl::latexSurrogatePair(odocstream & os, value_type c,
|
||||
value_type next, Encoding const & encoding)
|
||||
{
|
||||
// Writing next here may circumvent a possible font change between
|
||||
// c and next. Since next is only output if it forms a surrogate pair
|
||||
// with c we can ignore this:
|
||||
// A font change inside a surrogate pair does not make sense and is
|
||||
// hopefully impossible to input.
|
||||
// FIXME: change tracking
|
||||
// Is this correct WRT change tracking?
|
||||
docstring const latex1 = encoding.latexChar(next);
|
||||
docstring const latex2 = encoding.latexChar(c);
|
||||
os << latex1 << '{' << latex2 << '}';
|
||||
return latex1.length() + latex2.length() + 2;
|
||||
}
|
||||
|
||||
|
||||
bool Paragraph::Pimpl::simpleTeXBlanks(Encoding const & encoding,
|
||||
odocstream & os, TexRow & texrow,
|
||||
pos_type & i,
|
||||
unsigned int & column,
|
||||
LyXFont const & font,
|
||||
LyXLayout const & style)
|
||||
{
|
||||
if (style.pass_thru)
|
||||
return false;
|
||||
|
||||
if (i < size() - 1) {
|
||||
char_type next = getChar(i + 1);
|
||||
if (Encodings::isCombiningChar(next)) {
|
||||
// This space has an accent, so we must always output it.
|
||||
column += latexSurrogatePair(os, ' ', next, encoding) - 1;
|
||||
++i;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (lyxrc.plaintext_linelen > 0
|
||||
&& column > lyxrc.plaintext_linelen
|
||||
&& i
|
||||
&& getChar(i - 1) != ' '
|
||||
&& (i < size() - 1)
|
||||
// same in FreeSpacing mode
|
||||
&& !owner_->isFreeSpacing()
|
||||
// In typewriter mode, we want to avoid
|
||||
// ! . ? : at the end of a line
|
||||
&& !(font.family() == LyXFont::TYPEWRITER_FAMILY
|
||||
&& (getChar(i - 1) == '.'
|
||||
|| getChar(i - 1) == '?'
|
||||
|| getChar(i - 1) == ':'
|
||||
|| getChar(i - 1) == '!'))) {
|
||||
os << '\n';
|
||||
texrow.newline();
|
||||
texrow.start(owner_->id(), i + 1);
|
||||
column = 0;
|
||||
} else if (style.free_spacing) {
|
||||
os << '~';
|
||||
} else {
|
||||
os << ' ';
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
bool Paragraph::Pimpl::isTextAt(string const & str, pos_type pos) const
|
||||
{
|
||||
pos_type const len = str.length();
|
||||
|
||||
// is the paragraph large enough?
|
||||
if (pos + len > size())
|
||||
return false;
|
||||
|
||||
// does the wanted text start at point?
|
||||
for (string::size_type i = 0; i < str.length(); ++i) {
|
||||
// Caution: direct comparison of characters works only
|
||||
// because str is pure ASCII.
|
||||
if (str[i] != owner_->text_[pos + i])
|
||||
return false;
|
||||
}
|
||||
|
||||
// is there a font change in middle of the word?
|
||||
FontList::const_iterator cit = fontlist.begin();
|
||||
FontList::const_iterator end = fontlist.end();
|
||||
for (; cit != end; ++cit) {
|
||||
if (cit->pos() >= pos)
|
||||
break;
|
||||
}
|
||||
if (cit != end && pos + len - 1 > cit->pos())
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
|
||||
BufferParams const & bparams,
|
||||
odocstream & os,
|
||||
TexRow & texrow,
|
||||
OutputParams const & runparams,
|
||||
LyXFont & running_font,
|
||||
LyXFont & basefont,
|
||||
LyXFont const & outerfont,
|
||||
bool & open_font,
|
||||
Change::Type & running_change,
|
||||
LyXLayout const & style,
|
||||
pos_type & i,
|
||||
unsigned int & column,
|
||||
value_type const c)
|
||||
{
|
||||
if (style.pass_thru) {
|
||||
if (c != Paragraph::META_INSET) {
|
||||
if (c != '\0')
|
||||
// FIXME UNICODE: This can fail if c cannot
|
||||
// be encoded in the current encoding.
|
||||
os.put(c);
|
||||
} else
|
||||
owner_->getInset(i)->plaintext(buf, os, runparams);
|
||||
return;
|
||||
}
|
||||
|
||||
// Two major modes: LaTeX or plain
|
||||
// Handle here those cases common to both modes
|
||||
// and then split to handle the two modes separately.
|
||||
switch (c) {
|
||||
case Paragraph::META_INSET: {
|
||||
InsetBase * inset = owner_->getInset(i);
|
||||
|
||||
// FIXME: remove this check
|
||||
if (!inset)
|
||||
break;
|
||||
|
||||
// FIXME: move this to InsetNewline::latex
|
||||
if (inset->lyxCode() == InsetBase::NEWLINE_CODE) {
|
||||
// newlines are handled differently here than
|
||||
// the default in simpleTeXSpecialChars().
|
||||
if (!style.newline_allowed) {
|
||||
os << '\n';
|
||||
} else {
|
||||
if (open_font) {
|
||||
column += running_font.latexWriteEndChanges(
|
||||
os, basefont, basefont);
|
||||
open_font = false;
|
||||
}
|
||||
|
||||
if (running_font.family() == LyXFont::TYPEWRITER_FAMILY)
|
||||
os << '~';
|
||||
|
||||
basefont = owner_->getLayoutFont(bparams, outerfont);
|
||||
running_font = basefont;
|
||||
|
||||
if (runparams.moving_arg)
|
||||
os << "\\protect ";
|
||||
|
||||
os << "\\\\\n";
|
||||
}
|
||||
texrow.newline();
|
||||
texrow.start(owner_->id(), i + 1);
|
||||
column = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
// output change tracking marks only if desired,
|
||||
// if dvipost is installed,
|
||||
// and with dvi/ps (other formats don't work)
|
||||
LaTeXFeatures features(buf, bparams, runparams);
|
||||
bool const output = bparams.outputChanges
|
||||
&& runparams.flavor == OutputParams::LATEX
|
||||
&& features.isAvailable("dvipost");
|
||||
|
||||
if (inset->canTrackChanges()) {
|
||||
column += Changes::latexMarkChange(os, running_change,
|
||||
Change::UNCHANGED, output);
|
||||
running_change = Change::UNCHANGED;
|
||||
}
|
||||
|
||||
bool close = false;
|
||||
odocstream::pos_type const len = os.tellp();
|
||||
|
||||
if ((inset->lyxCode() == InsetBase::GRAPHICS_CODE
|
||||
|| inset->lyxCode() == InsetBase::MATH_CODE
|
||||
|| inset->lyxCode() == InsetBase::URL_CODE)
|
||||
&& running_font.isRightToLeft()) {
|
||||
os << "\\L{";
|
||||
close = true;
|
||||
}
|
||||
|
||||
#ifdef WITH_WARNINGS
|
||||
#warning Bug: we can have an empty font change here!
|
||||
// if there has just been a font change, we are going to close it
|
||||
// right now, which means stupid latex code like \textsf{}. AFAIK,
|
||||
// this does not harm dvi output. A minor bug, thus (JMarc)
|
||||
#endif
|
||||
// some insets cannot be inside a font change command
|
||||
if (open_font && inset->noFontChange()) {
|
||||
column += running_font.latexWriteEndChanges(
|
||||
os, basefont, basefont);
|
||||
open_font = false;
|
||||
basefont = owner_->getLayoutFont(bparams, outerfont);
|
||||
running_font = basefont;
|
||||
}
|
||||
|
||||
int tmp = inset->latex(buf, os, runparams);
|
||||
|
||||
if (close)
|
||||
os << '}';
|
||||
|
||||
if (tmp) {
|
||||
for (int j = 0; j < tmp; ++j) {
|
||||
texrow.newline();
|
||||
}
|
||||
texrow.start(owner_->id(), i + 1);
|
||||
column = 0;
|
||||
} else {
|
||||
column += os.tellp() - len;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
// And now for the special cases within each mode
|
||||
|
||||
switch (c) {
|
||||
case '\\':
|
||||
os << "\\textbackslash{}";
|
||||
column += 15;
|
||||
break;
|
||||
|
||||
// The following characters could be written literally in latin1, but they
|
||||
// would be wrongly converted on systems where char is signed, so we give
|
||||
// the code points.
|
||||
// This also makes us independant from the encoding of this source file.
|
||||
case '|': case '<': case '>':
|
||||
// In T1 encoding, these characters exist
|
||||
if (lyxrc.fontenc == "T1") {
|
||||
os.put(c);
|
||||
//... but we should avoid ligatures
|
||||
if ((c == '>' || c == '<')
|
||||
&& i <= size() - 2
|
||||
&& getChar(i + 1) == c) {
|
||||
//os << "\\textcompwordmark{}";
|
||||
//column += 19;
|
||||
// Jean-Marc, have a look at
|
||||
// this. I think this works
|
||||
// equally well:
|
||||
os << "\\,{}";
|
||||
// Lgb
|
||||
column += 3;
|
||||
}
|
||||
break;
|
||||
}
|
||||
// Typewriter font also has them
|
||||
if (running_font.family() == LyXFont::TYPEWRITER_FAMILY) {
|
||||
os.put(c);
|
||||
break;
|
||||
}
|
||||
// Otherwise, we use what LaTeX
|
||||
// provides us.
|
||||
switch (c) {
|
||||
case '<':
|
||||
os << "\\textless{}";
|
||||
column += 10;
|
||||
break;
|
||||
case '>':
|
||||
os << "\\textgreater{}";
|
||||
column += 13;
|
||||
break;
|
||||
case '|':
|
||||
os << "\\textbar{}";
|
||||
column += 9;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case '-': // "--" in Typewriter mode -> "-{}-"
|
||||
if (i <= size() - 2 &&
|
||||
getChar(i + 1) == '-' &&
|
||||
running_font.family() == LyXFont::TYPEWRITER_FAMILY) {
|
||||
os << "-{}";
|
||||
column += 2;
|
||||
} else {
|
||||
os << '-';
|
||||
}
|
||||
break;
|
||||
|
||||
case '\"':
|
||||
os << "\\char`\\\"{}";
|
||||
column += 9;
|
||||
break;
|
||||
|
||||
case '$': case '&':
|
||||
case '%': case '#': case '{':
|
||||
case '}': case '_':
|
||||
os << '\\';
|
||||
os.put(c);
|
||||
column += 1;
|
||||
break;
|
||||
|
||||
case '~':
|
||||
os << "\\textasciitilde{}";
|
||||
column += 16;
|
||||
break;
|
||||
|
||||
case '^':
|
||||
os << "\\textasciicircum{}";
|
||||
column += 17;
|
||||
break;
|
||||
|
||||
case '*': case '[':
|
||||
// avoid being mistaken for optional arguments
|
||||
os << '{';
|
||||
os.put(c);
|
||||
os << '}';
|
||||
column += 2;
|
||||
break;
|
||||
|
||||
case ' ':
|
||||
// Blanks are printed before font switching.
|
||||
// Sure? I am not! (try nice-latex)
|
||||
// I am sure it's correct. LyX might be smarter
|
||||
// in the future, but for now, nothing wrong is
|
||||
// written. (Asger)
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
// I assume this is hack treating typewriter as verbatim
|
||||
// FIXME UNICODE: This can fail if c cannot be encoded
|
||||
// in the current encoding.
|
||||
if (running_font.family() == LyXFont::TYPEWRITER_FAMILY) {
|
||||
if (c != '\0') {
|
||||
os.put(c);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
// LyX, LaTeX etc.
|
||||
|
||||
// FIXME: if we have "LaTeX" with a font
|
||||
// change in the middle (before the 'T', then
|
||||
// the "TeX" part is still special cased.
|
||||
// Really we should only operate this on
|
||||
// "words" for some definition of word
|
||||
|
||||
size_t pnr = 0;
|
||||
|
||||
for (; pnr < phrases_nr; ++pnr) {
|
||||
if (isTextAt(special_phrases[pnr].phrase, i)) {
|
||||
os << special_phrases[pnr].macro;
|
||||
i += special_phrases[pnr].phrase.length() - 1;
|
||||
column += special_phrases[pnr].macro.length() - 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (pnr == phrases_nr && c != '\0') {
|
||||
Encoding const & encoding = *(runparams.encoding);
|
||||
if (i < size() - 1) {
|
||||
char_type next = getChar(i + 1);
|
||||
if (Encodings::isCombiningChar(next)) {
|
||||
column += latexSurrogatePair(os, c, next, encoding) - 1;
|
||||
++i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
docstring const latex = encoding.latexChar(c);
|
||||
if (latex.length() > 1 &&
|
||||
latex[latex.length() - 1] != '}') {
|
||||
// Prevent eating of a following
|
||||
// space or command corruption by
|
||||
// following characters
|
||||
column += latex.length() + 1;
|
||||
os << latex << "{}";
|
||||
} else {
|
||||
column += latex.length() - 1;
|
||||
os << latex;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Paragraph::Pimpl::validate(LaTeXFeatures & features,
|
||||
LyXLayout const & layout) const
|
||||
{
|
||||
BufferParams const & bparams = features.bufferParams();
|
||||
|
||||
// check the params.
|
||||
if (!params.spacing().isDefault())
|
||||
features.require("setspace");
|
||||
|
||||
// then the layouts
|
||||
features.useLayout(layout.name());
|
||||
|
||||
// then the fonts
|
||||
Language const * doc_language = bparams.language;
|
||||
|
||||
FontList::const_iterator fcit = fontlist.begin();
|
||||
FontList::const_iterator fend = fontlist.end();
|
||||
for (; fcit != fend; ++fcit) {
|
||||
if (fcit->font().noun() == LyXFont::ON) {
|
||||
LYXERR(Debug::LATEX) << "font.noun: "
|
||||
<< fcit->font().noun()
|
||||
<< endl;
|
||||
features.require("noun");
|
||||
LYXERR(Debug::LATEX) << "Noun enabled. Font: "
|
||||
<< to_utf8(fcit->font().stateText(0))
|
||||
<< endl;
|
||||
}
|
||||
switch (fcit->font().color()) {
|
||||
case LColor::none:
|
||||
case LColor::inherit:
|
||||
case LColor::ignore:
|
||||
// probably we should put here all interface colors used for
|
||||
// font displaying! For now I just add this ones I know of (Jug)
|
||||
case LColor::latex:
|
||||
case LColor::note:
|
||||
break;
|
||||
default:
|
||||
features.require("color");
|
||||
LYXERR(Debug::LATEX) << "Color enabled. Font: "
|
||||
<< to_utf8(fcit->font().stateText(0))
|
||||
<< endl;
|
||||
}
|
||||
|
||||
Language const * language = fcit->font().language();
|
||||
if (language->babel() != doc_language->babel() &&
|
||||
language != ignore_language &&
|
||||
language != latex_language)
|
||||
{
|
||||
features.useLanguage(language);
|
||||
LYXERR(Debug::LATEX) << "Found language "
|
||||
<< language->babel() << endl;
|
||||
}
|
||||
}
|
||||
|
||||
if (!params.leftIndent().zero())
|
||||
features.require("ParagraphLeftIndent");
|
||||
|
||||
// then the insets
|
||||
InsetList::const_iterator icit = owner_->insetlist.begin();
|
||||
InsetList::const_iterator iend = owner_->insetlist.end();
|
||||
for (; icit != iend; ++icit) {
|
||||
if (icit->inset) {
|
||||
icit->inset->validate(features);
|
||||
if (layout.needprotect &&
|
||||
icit->inset->lyxCode() == InsetBase::FOOT_CODE)
|
||||
features.require("NeedLyXFootnoteCode");
|
||||
}
|
||||
}
|
||||
|
||||
// then the contents
|
||||
for (pos_type i = 0; i < size() ; ++i) {
|
||||
for (size_t pnr = 0; pnr < phrases_nr; ++pnr) {
|
||||
if (!special_phrases[pnr].builtin
|
||||
&& isTextAt(special_phrases[pnr].phrase, i)) {
|
||||
features.require(special_phrases[pnr].phrase);
|
||||
break;
|
||||
}
|
||||
}
|
||||
Encodings::validate(getChar(i), features);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} // namespace lyx
|
||||
@ -1,180 +0,0 @@
|
||||
// -*- C++ -*-
|
||||
/**
|
||||
* \file paragraph_pimpl.h
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author Lars Gullik Bjønnes
|
||||
* \author Jean-Marc Lasgouttes
|
||||
* \author John Levon
|
||||
* \author André Pönitz
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*/
|
||||
|
||||
#ifndef PARAGRAPH_PIMPL_H
|
||||
#define PARAGRAPH_PIMPL_H
|
||||
|
||||
#include "paragraph.h"
|
||||
|
||||
#include "changes.h"
|
||||
#include "lyxfont.h"
|
||||
#include "ParagraphParameters.h"
|
||||
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
|
||||
|
||||
namespace lyx {
|
||||
|
||||
class Encoding;
|
||||
class LyXLayout;
|
||||
|
||||
|
||||
class Paragraph::Pimpl {
|
||||
public:
|
||||
///
|
||||
Pimpl(Paragraph * owner);
|
||||
/// "Copy constructor"
|
||||
Pimpl(Pimpl const &, Paragraph * owner);
|
||||
|
||||
//
|
||||
// Change tracking
|
||||
//
|
||||
/// look up change at given pos
|
||||
Change const & lookupChange(pos_type pos) const;
|
||||
/// is there a change within the given range ?
|
||||
bool isChanged(pos_type start, pos_type end) const;
|
||||
/// will the paragraph be physically merged with the next
|
||||
/// one if the imaginary end-of-par character is logically deleted?
|
||||
bool isMergedOnEndOfParDeletion(bool trackChanges) const;
|
||||
/// set change for the entire par
|
||||
void setChange(Change const & change);
|
||||
/// set change at given pos
|
||||
void setChange(pos_type pos, Change const & change);
|
||||
/// accept changes within the given range
|
||||
void acceptChanges(BufferParams const & bparams, pos_type start, pos_type end);
|
||||
/// reject changes within the given range
|
||||
void rejectChanges(BufferParams const & bparams, pos_type start, pos_type end);
|
||||
|
||||
///
|
||||
value_type getChar(pos_type pos) const;
|
||||
///
|
||||
void insertChar(pos_type pos, value_type c, Change const & change);
|
||||
///
|
||||
void insertInset(pos_type pos, InsetBase * inset, Change const & change);
|
||||
/// (logically) erase the char at pos; return true if it was actually erased
|
||||
bool eraseChar(pos_type pos, bool trackChanges);
|
||||
/// (logically) erase the given range; return the number of chars actually erased
|
||||
int eraseChars(pos_type start, pos_type end, bool trackChanges);
|
||||
///
|
||||
InsetBase * inset_owner;
|
||||
|
||||
/** A font entry covers a range of positions. Notice that the
|
||||
entries in the list are inserted in random order.
|
||||
I don't think it's worth the effort to implement a more effective
|
||||
datastructure, because the number of different fonts in a paragraph
|
||||
is limited. (Asger)
|
||||
Nevertheless, I decided to store fontlist using a sorted vector:
|
||||
fontlist = { {pos_1,font_1} , {pos_2,font_2} , ... } where
|
||||
pos_1 < pos_2 < ..., font_{i-1} != font_i for all i,
|
||||
and font_i covers the chars in positions pos_{i-1}+1,...,pos_i
|
||||
(font_1 covers the chars 0,...,pos_1) (Dekel)
|
||||
*/
|
||||
class FontTable {
|
||||
public:
|
||||
///
|
||||
FontTable(pos_type p, LyXFont const & f)
|
||||
: pos_(p), font_(f)
|
||||
{}
|
||||
///
|
||||
pos_type pos() const { return pos_; }
|
||||
///
|
||||
void pos(pos_type p) { pos_ = p; }
|
||||
///
|
||||
LyXFont const & font() const { return font_; }
|
||||
///
|
||||
void font(LyXFont const & f) { font_ = f;}
|
||||
private:
|
||||
/// End position of paragraph this font attribute covers
|
||||
pos_type pos_;
|
||||
/** Font. Interpretation of the font values:
|
||||
If a value is LyXFont::INHERIT_*, it means that the font
|
||||
attribute is inherited from either the layout of this
|
||||
paragraph or, in the case of nested paragraphs, from the
|
||||
layout in the environment one level up until completely
|
||||
resolved.
|
||||
The values LyXFont::IGNORE_* and LyXFont::TOGGLE are NOT
|
||||
allowed in these font tables.
|
||||
*/
|
||||
LyXFont font_;
|
||||
};
|
||||
///
|
||||
friend class matchFT;
|
||||
///
|
||||
class matchFT {
|
||||
public:
|
||||
/// used by lower_bound and upper_bound
|
||||
int operator()(FontTable const & a, FontTable const & b) const {
|
||||
return a.pos() < b.pos();
|
||||
}
|
||||
};
|
||||
|
||||
///
|
||||
typedef std::vector<FontTable> FontList;
|
||||
///
|
||||
FontList fontlist;
|
||||
|
||||
/// Output the surrogate pair formed by \p c and \p next to \p os.
|
||||
/// \return the number of characters written.
|
||||
int latexSurrogatePair(odocstream & os, value_type c, value_type next,
|
||||
Encoding const &);
|
||||
/// Output a space in appropriate formatting (or a surrogate pair
|
||||
/// if the next character is a combining character).
|
||||
/// \return whether a surrogate pair was output.
|
||||
bool simpleTeXBlanks(Encoding const &,
|
||||
odocstream &, TexRow & texrow,
|
||||
pos_type & i,
|
||||
unsigned int & column,
|
||||
LyXFont const & font,
|
||||
LyXLayout const & style);
|
||||
///
|
||||
void simpleTeXSpecialChars(Buffer const &, BufferParams const &,
|
||||
odocstream &,
|
||||
TexRow & texrow, OutputParams const &,
|
||||
LyXFont & running_font,
|
||||
LyXFont & basefont,
|
||||
LyXFont const & outerfont,
|
||||
bool & open_font,
|
||||
Change::Type & running_change,
|
||||
LyXLayout const & style,
|
||||
pos_type & i,
|
||||
unsigned int & column, value_type const c);
|
||||
|
||||
///
|
||||
void validate(LaTeXFeatures & features,
|
||||
LyXLayout const & layout) const;
|
||||
|
||||
///
|
||||
unsigned int id_;
|
||||
///
|
||||
static unsigned int paragraph_id;
|
||||
///
|
||||
ParagraphParameters params;
|
||||
|
||||
private:
|
||||
///
|
||||
pos_type size() const { return owner_->size(); }
|
||||
/// match a string against a particular point in the paragraph
|
||||
bool isTextAt(std::string const & str, pos_type pos) const;
|
||||
|
||||
/// for recording and looking up changes
|
||||
Changes changes_;
|
||||
|
||||
/// Who owns us?
|
||||
Paragraph * owner_;
|
||||
};
|
||||
|
||||
|
||||
} // namespace lyx
|
||||
|
||||
#endif
|
||||
@ -1329,6 +1329,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
|
||||
mathDispatch(cur, FuncRequest(LFUN_SELF_INSERT, "^"), false);
|
||||
break;
|
||||
|
||||
case LFUN_GREEK_INSERT: {
|
||||
cur.insert(new InsetMathHull(hullSimple));
|
||||
cur.dispatch(FuncRequest(LFUN_CHAR_FORWARD));
|
||||
cur.dispatch(FuncRequest(LFUN_CHAR_FORWARD));
|
||||
cur.dispatch(cmd);
|
||||
break;
|
||||
}
|
||||
case LFUN_MATH_INSERT:
|
||||
case LFUN_MATH_MATRIX:
|
||||
case LFUN_MATH_DELIM:
|
||||
@ -1934,7 +1941,7 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
|
||||
case LFUN_CLEARDOUBLEPAGE_INSERT:
|
||||
case LFUN_MATH_DISPLAY:
|
||||
case LFUN_MATH_IMPORT_SELECTION:
|
||||
case LFUN_MATH_INSERT:
|
||||
case LFUN_GREEK_INSERT:
|
||||
case LFUN_MATH_MODE:
|
||||
case LFUN_MATH_MACRO:
|
||||
case LFUN_MATH_MATRIX:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user