2003-10-23 13:28:49 +00:00
|
|
|
/**
|
2007-04-26 04:41:58 +00:00
|
|
|
* \file Bidi.cpp
|
2003-10-23 13:28:49 +00:00
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
*
|
|
|
|
* \author Dekel Tsur
|
|
|
|
*
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
*/
|
|
|
|
|
2005-04-26 10:30:24 +00:00
|
|
|
#include <config.h>
|
2003-10-23 13:28:49 +00:00
|
|
|
|
|
|
|
#include "Bidi.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "Buffer.h"
|
2007-05-15 17:19:05 +00:00
|
|
|
#include "BufferView.h"
|
2007-04-29 18:17:15 +00:00
|
|
|
#include "Font.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "Row.h"
|
|
|
|
#include "LyXRC.h"
|
|
|
|
#include "Paragraph.h"
|
2003-10-23 13:28:49 +00:00
|
|
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
namespace lyx {
|
2003-10-23 13:28:49 +00:00
|
|
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
pos_type Bidi::log2vis(pos_type pos) const
|
2003-10-23 13:28:49 +00:00
|
|
|
{
|
|
|
|
return (start_ == -1) ? pos : log2vis_list_[pos - start_];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
pos_type Bidi::vis2log(pos_type pos) const
|
2003-10-23 13:28:49 +00:00
|
|
|
{
|
|
|
|
return (start_ == -1) ? pos : vis2log_list_[pos - start_];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
pos_type Bidi::level(pos_type pos) const
|
2003-10-23 13:28:49 +00:00
|
|
|
{
|
|
|
|
return (start_ == -1) ? 0 : levels_[pos - start_];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
bool Bidi::inRange(pos_type pos) const
|
2003-10-23 13:28:49 +00:00
|
|
|
{
|
|
|
|
return start_ == -1 || (start_ <= pos && pos <= end_);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Bidi::same_direction() const
|
|
|
|
{
|
|
|
|
return same_direction_;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Bidi::computeTables(Paragraph const & par,
|
2004-03-01 12:23:17 +00:00
|
|
|
Buffer const & buf, Row const & row)
|
2003-10-23 13:28:49 +00:00
|
|
|
{
|
|
|
|
same_direction_ = true;
|
|
|
|
if (!lyxrc.rtl_support) {
|
|
|
|
start_ = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
* src/insets/Inset.h,cpp: LISTINGS_CODE
* src/insets/InsetInclude.cpp: handle \lstinputlisting
* src/insets/InsetListings.h,cpp: new listings inset
* src/insets/InsetListingsParams.h,cpp: parameters from listings package
* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
* src/Bidi.cpp: handle LISTINGS_CODE
* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
* src/frontends/qt4/ui/ListingsUi.ui: new dialog
* src/frontends/qt4/ui/IncludeUi.ui: update UI
* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
* src/frontends/qt4/QListings.h,cpp: new listings inset
* src/frontends/qt4/Dialogs.cpp: new listings dialog
* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
* src/frontends/controllers/ControlListings.h,cpp: new listings inset
* src/LyXFunc.cpp: handle LISTING_CODE
* src/Paragraph.cpp: handle LISTING_CODE
* src/factory.cpp: new listings inset
* src/CutAndPaste.cpp: handle LISTINGS_CODE
* src/LaTeXFeatures.cpp: require listings
* src/Text3.cpp: Handle LISTINGS_CODE
* src/lfuns.h: add LFUN_LISTING_INSERT
* src/Buffer.cpp: change lyx file format to 269
* src/BufferParams.h,cpp: add listings_params to preamble
* lib/lyx2lyx/LyX.py: lyx2lyx
* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
* lib/ui/stdmenus.inc: new menu item (no shortcut!)
* src/insets/Makefile.am: update autotools
* src/frontends/controllers/Makefile.am
* src/frontends/qt4/Makefile.dialogs
* src/frontends/qt4/Makefile.am
* po/POTFILES.in: a few more translatable files.
* development/scons/scons_manifest.py: scons build system
* development/FORMAT: document format changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
|
|
|
if (par.ownerCode() == Inset::ERT_CODE || par.ownerCode() == Inset::LISTINGS_CODE) {
|
2003-10-23 13:28:49 +00:00
|
|
|
start_ = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
start_ = row.pos();
|
2003-10-27 11:44:10 +00:00
|
|
|
end_ = row.endpos() - 1;
|
2003-10-23 13:28:49 +00:00
|
|
|
|
|
|
|
if (start_ > end_) {
|
|
|
|
start_ = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (end_ + 2 - start_ >
|
|
|
|
static_cast<pos_type>(log2vis_list_.size())) {
|
|
|
|
pos_type new_size =
|
|
|
|
(end_ + 2 - start_ < 500) ?
|
|
|
|
500 : 2 * (end_ + 2 - start_);
|
|
|
|
log2vis_list_.resize(new_size);
|
|
|
|
vis2log_list_.resize(new_size);
|
|
|
|
levels_.resize(new_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
vis2log_list_[end_ + 1 - start_] = -1;
|
|
|
|
log2vis_list_[end_ + 1 - start_] = -1;
|
|
|
|
|
|
|
|
BufferParams const & bufparams = buf.params();
|
|
|
|
pos_type stack[2];
|
2007-09-04 10:27:55 +00:00
|
|
|
bool const rtl_par = par.isRTL(bufparams);
|
2003-10-23 13:28:49 +00:00
|
|
|
int lev = 0;
|
|
|
|
bool rtl = false;
|
|
|
|
bool rtl0 = false;
|
2003-11-13 13:43:44 +00:00
|
|
|
pos_type const body_pos = par.beginOfBody();
|
2003-10-23 13:28:49 +00:00
|
|
|
|
|
|
|
for (pos_type lpos = start_; lpos <= end_; ++lpos) {
|
2007-06-08 14:20:06 +00:00
|
|
|
bool is_space = false;
|
|
|
|
// We do not handle spaces around an RTL segment in a special way anymore.
|
|
|
|
// Neither do we do so when generating the LaTeX, so setting is_space
|
|
|
|
// to false makes the view in the GUI consistent with the output of LaTeX
|
|
|
|
// later. The old setting was:
|
|
|
|
//bool is_space = par.isLineSeparator(lpos);
|
|
|
|
// FIXME: once we're sure that this is what we really want, we should just
|
|
|
|
// get rid of this variable...
|
2003-10-23 13:28:49 +00:00
|
|
|
pos_type const pos =
|
|
|
|
(is_space && lpos + 1 <= end_ &&
|
|
|
|
!par.isLineSeparator(lpos + 1) &&
|
|
|
|
!par.isNewline(lpos + 1))
|
|
|
|
? lpos + 1 : lpos;
|
2007-04-29 18:17:15 +00:00
|
|
|
Font font = par.getFontSettings(bufparams, pos);
|
2003-10-23 13:28:49 +00:00
|
|
|
if (pos != lpos && 0 < lpos && rtl0 && font.isRightToLeft() &&
|
2007-04-29 18:17:15 +00:00
|
|
|
font.number() == Font::ON &&
|
2003-10-23 13:28:49 +00:00
|
|
|
par.getFontSettings(bufparams, lpos - 1).number()
|
2007-04-29 18:17:15 +00:00
|
|
|
== Font::ON) {
|
2003-10-23 13:28:49 +00:00
|
|
|
font = par.getFontSettings(bufparams, lpos);
|
|
|
|
is_space = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool new_rtl = font.isVisibleRightToLeft();
|
|
|
|
bool new_rtl0 = font.isRightToLeft();
|
|
|
|
int new_level;
|
|
|
|
|
|
|
|
if (lpos == body_pos - 1
|
|
|
|
&& row.pos() < body_pos - 1
|
|
|
|
&& is_space) {
|
|
|
|
new_level = rtl_par ? 1 : 0;
|
|
|
|
new_rtl0 = rtl_par;
|
|
|
|
new_rtl = rtl_par;
|
|
|
|
} else if (new_rtl0)
|
|
|
|
new_level = new_rtl ? 1 : 2;
|
|
|
|
else
|
|
|
|
new_level = rtl_par ? 2 : 0;
|
|
|
|
|
|
|
|
if (is_space && new_level >= lev) {
|
|
|
|
new_level = lev;
|
|
|
|
new_rtl = rtl;
|
|
|
|
new_rtl0 = rtl0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int new_level2 = new_level;
|
|
|
|
|
|
|
|
if (lev == new_level && rtl0 != new_rtl0) {
|
|
|
|
--new_level2;
|
|
|
|
log2vis_list_[lpos - start_] = rtl ? 1 : -1;
|
|
|
|
} else if (lev < new_level) {
|
|
|
|
log2vis_list_[lpos - start_] = rtl ? -1 : 1;
|
2005-11-02 20:11:36 +00:00
|
|
|
if (new_level > 0 && !rtl_par)
|
2003-10-23 13:28:49 +00:00
|
|
|
same_direction_ = false;
|
|
|
|
} else
|
|
|
|
log2vis_list_[lpos - start_] = new_rtl ? -1 : 1;
|
|
|
|
rtl = new_rtl;
|
|
|
|
rtl0 = new_rtl0;
|
|
|
|
levels_[lpos - start_] = new_level;
|
|
|
|
|
|
|
|
while (lev > new_level2) {
|
|
|
|
pos_type old_lpos = stack[--lev];
|
|
|
|
int delta = lpos - old_lpos - 1;
|
|
|
|
if (lev % 2)
|
|
|
|
delta = -delta;
|
|
|
|
log2vis_list_[lpos - start_] += delta;
|
|
|
|
log2vis_list_[old_lpos - start_] += delta;
|
|
|
|
}
|
|
|
|
while (lev < new_level)
|
|
|
|
stack[lev++] = lpos;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (lev > 0) {
|
|
|
|
pos_type const old_lpos = stack[--lev];
|
|
|
|
int delta = end_ - old_lpos;
|
|
|
|
if (lev % 2)
|
|
|
|
delta = -delta;
|
|
|
|
log2vis_list_[old_lpos - start_] += delta;
|
|
|
|
}
|
|
|
|
|
|
|
|
pos_type vpos = start_ - 1;
|
|
|
|
for (pos_type lpos = start_; lpos <= end_; ++lpos) {
|
|
|
|
vpos += log2vis_list_[lpos - start_];
|
|
|
|
vis2log_list_[vpos - start_] = lpos;
|
|
|
|
log2vis_list_[lpos - start_] = vpos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// This method requires a previous call to computeTables()
|
|
|
|
bool Bidi::isBoundary(Buffer const & buf, Paragraph const & par,
|
|
|
|
pos_type pos) const
|
|
|
|
{
|
|
|
|
if (!lyxrc.rtl_support || pos == 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!inRange(pos - 1)) {
|
|
|
|
// This can happen if pos is the first char of a row.
|
|
|
|
// Returning false in this case is incorrect!
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool const rtl = level(pos - 1) % 2;
|
|
|
|
bool const rtl2 = inRange(pos)
|
|
|
|
? level(pos) % 2
|
2007-09-04 10:27:55 +00:00
|
|
|
: par.isRTL(buf.params());
|
2003-10-23 13:28:49 +00:00
|
|
|
return rtl != rtl2;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool Bidi::isBoundary(Buffer const & buf, Paragraph const & par,
|
2007-04-29 18:17:15 +00:00
|
|
|
pos_type pos, Font const & font) const
|
2003-10-23 13:28:49 +00:00
|
|
|
{
|
|
|
|
if (!lyxrc.rtl_support)
|
|
|
|
return false; // This is just for speedup
|
|
|
|
|
|
|
|
bool const rtl = font.isVisibleRightToLeft();
|
|
|
|
bool const rtl2 = inRange(pos)
|
|
|
|
? level(pos) % 2
|
2007-09-04 10:27:55 +00:00
|
|
|
: par.isRTL(buf.params());
|
2003-10-23 13:28:49 +00:00
|
|
|
return rtl != rtl2;
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
2007-05-28 22:27:45 +00:00
|
|
|
bool reverseDirectionNeeded(Cursor const & cur)
|
2007-05-15 17:19:05 +00:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* We determine the directions based on the direction of the
|
|
|
|
* bottom() --- i.e., outermost --- paragraph, because that is
|
|
|
|
* the only way to achieve consistency of the arrow's movements
|
|
|
|
* within a paragraph, and thus avoid situations in which the
|
|
|
|
* cursor gets stuck.
|
|
|
|
*/
|
2007-09-04 10:27:55 +00:00
|
|
|
return cur.bottom().paragraph().isRTL(cur.bv().buffer().params());
|
2007-05-15 17:19:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-05-16 09:35:12 +00:00
|
|
|
bool isWithinRtlParagraph(Cursor const & cur)
|
|
|
|
{
|
2007-09-04 10:27:55 +00:00
|
|
|
return cur.innerParagraph().isRTL(cur.bv().buffer().params());
|
2007-05-16 09:35:12 +00:00
|
|
|
}
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
} // namespace lyx
|