anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert commits from 36745

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36749 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-12-07 00:05:40 +00:00
parent 430d03811e
commit c68d754a74
13 changed files with 39 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
development/cmake/CMakeLists.txt
View File

@ -69,7 +69,6 @@ LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC)
LYX_OPTION(WALL "Enable all warnings" OFF MSVC)
LYX_OPTION(DISABLE_PCH "Disable precompiled headers" ON ALL)
LYX_OPTION(MERGE_FILES "Merge source files into one compilation unit" OFF ALL)
LYX_OPTION(MERGE_REBUILD "Rebuild generated files from merged files build" OFF ALL)
LYX_OPTION(DEBUG_GLIBC "Enable libstdc++ debug mode" OFF GCC)
LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++pedantic debug mode" OFF GCC)
LYX_OPTION(STDLIB_DEBUG "Use debug stdlib" OFF GCC)

3
development/cmake/modules/LyXMacros.cmake
View File

@ -152,8 +152,7 @@ macro(lyx_const_touched_files _allinone_name _list)
endif()
endif()
if (LYX_MERGE_REBUILD)
#message(STATUS "Merge files build: rebuilding generated files")
if (merge_rebuild)
set(_rebuild_file_const 1)
set(_rebuild_file_touched 1)
endif()

3
src/Format.cpp
View File

@ -24,7 +24,6 @@
#include "support/lstrings.h"
#include "support/os.h"
#include "support/Systemcall.h"
#include "support/textutils.h"
#include <algorithm>
@ -103,7 +102,7 @@ bool Format::isChildFormat() const
{
if (name_.empty())
return false;
return isDigitASCII(name_[name_.length() - 1]);
return isdigit(name_[name_.length() - 1]);
}

26
src/Paragraph.cpp
View File

@ -358,8 +358,6 @@ public:
return speller_change_number > speller_state_.currentChangeNumber();
}
bool ignoreWord(docstring const & word) const ;
void setMisspelled(pos_type from, pos_type to, SpellChecker::Result state)
{
pos_type textsize = owner_->size();
@ -2820,7 +2818,7 @@ bool Paragraph::isWordSeparator(pos_type pos) const
char_type const c = d->text_[pos];
// We want to pass the ' and escape chars to the spellchecker
static docstring const quote = from_utf8(lyxrc.spellchecker_esc_chars + '\'');
return (!isLetterChar(c) && !isDigitASCII(c) && !contains(quote, c))
return (!isLetterChar(c) && !isDigit(c) && !contains(quote, c))
|| pos == size();
}
@ -2830,7 +2828,7 @@ bool Paragraph::isChar(pos_type pos) const
if (Inset const * inset = getInset(pos))
return inset->isChar();
char_type const c = d->text_[pos];
return !isLetterChar(c) && !isDigitASCII(c) && !lyx::isSpace(c);
return !isLetterChar(c) && !isDigit(c) && !lyx::isSpace(c);
}
@ -3547,21 +3545,6 @@ bool Paragraph::needsSpellCheck() const
}
bool Paragraph::Private::ignoreWord(docstring const & word) const
{
// Ignore words with digits
// FIXME: make this customizable
// (note that some checkers ignore words with digits by default)
docstring::const_iterator cit = word.begin();
docstring::const_iterator const end = word.end();
for (; cit != end; ++cit) {
if (isNumber((*cit)))
return true;
}
return false;
}
SpellChecker::Result Paragraph::spellCheck(pos_type & from, pos_type & to,
WordLangTuple & wl, docstring_list & suggestions,
bool do_suggestion, bool check_learned) const
@ -3587,7 +3570,10 @@ SpellChecker::Result Paragraph::spellCheck(pos_type & from, pos_type & to,
return result;
if (needsSpellCheck() || check_learned) {
if (!d->ignoreWord(word)) {
// Ignore words with digits
// FIXME: make this customizable
// (note that some checkers ignore words with digits by default)
if (!hasDigit(word)) {
bool const trailing_dot = to < size() && d->text_[to] == '.';
result = speller->check(wl);
if (SpellChecker::misspelled(result) && trailing_dot) {

4
src/Text.cpp
View File

@ -850,7 +850,7 @@ void Text::insertChar(Cursor & cur, char_type c)
static docstring const number_seperators = from_ascii(".,:");
if (cur.current_font.fontInfo().number() == FONT_ON) {
if (!isDigitASCII(c) && !contains(number_operators, c) &&
if (!isDigit(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
cur.pos() != 0 &&
cur.pos() != cur.lastpos() &&
@ -858,7 +858,7 @@ void Text::insertChar(Cursor & cur, char_type c)
tm.displayFont(pit, cur.pos() - 1).fontInfo().number() == FONT_ON)
)
number(cur); // Set current_font.number to OFF
} else if (isDigitASCII(c) &&
} else if (isDigit(c) &&
cur.real_current_font.isVisibleRightToLeft()) {
number(cur); // Set current_font.number to ON

28
src/frontends/qt4/GuiView.cpp
View File

@ -446,7 +446,7 @@ GuiView::GuiView(int id)
#if (QT_VERSION >= 0x040400)
connect(&d.autosave_watcher_, SIGNAL(finished()), this,
SLOT(autoSaveThreadFinished()));
SLOT(processingThreadFinished()));
connect(&d.processing_thread_watcher_, SIGNAL(finished()), this,
SLOT(processingThreadFinished()));
@ -548,30 +548,18 @@ void GuiView::processingThreadStarted()
}
void GuiView::processingThreadFinished(bool show_errors)
void GuiView::processingThreadFinished()
{
QFutureWatcher<docstring> const * watcher =
static_cast<QFutureWatcher<docstring> const *>(sender());
message(watcher->result());
updateToolbars();
if (show_errors) {
errors(d.last_export_format);
}
errors(d.last_export_format);
d.processing_cursor_timer_.stop();
restoreCursorShapes();
d.indicates_processing_ = false;
}
void GuiView::processingThreadFinished()
{
processingThreadFinished(true);
}
void GuiView::autoSaveThreadFinished()
{
processingThreadFinished(false);
}
#else
void GuiView::setCursorShapes(Qt::CursorShape)
@ -599,19 +587,9 @@ void GuiView::processingThreadStarted()
}
void GuiView::processingThreadFinished(bool)
{
}
void GuiView::processingThreadFinished()
{
}
void GuiView::autoSaveThreadFinished()
{
}
#endif

2
src/frontends/qt4/GuiView.h
View File

@ -232,9 +232,7 @@ private Q_SLOTS:
/// For completion of autosave or export threads.
void processingThreadStarted();
void processingThreadFinished(bool show_errors);
void processingThreadFinished();
void autoSaveThreadFinished();
void indicateProcessing();
/// must be called in GUI thread

4
src/insets/InsetBibtex.cpp
View File

@ -555,13 +555,13 @@ namespace {
return false;
// check for field type
if (isDigitASCII(ch)) {
if (isDigit(ch)) {
// read integer value
do {
val += ch;
ifs.get(ch);
} while (ifs && isDigitASCII(ch));
} while (ifs && isDigit(ch));
if (!ifs)
return false;

2
src/insets/InsetListingsParams.cpp
View File

@ -768,7 +768,7 @@ void InsetListingsParams::addParam(string const & key,
else {
bool has_special_char = false;
for (size_t i = 0; i < value.size(); ++i)
if (!isAlnumASCII(value[i])) {
if (!isAlphaASCII(value[i]) && !isDigit(value[i])) {
has_special_char = true;
break;
}

6
src/support/docstring.cpp
View File

@ -753,9 +753,9 @@ private:
bool isNumpunct(lyx::char_type const c) const
{
/// Only account for the standard numpunct "C" locale facet.
return c == '-' || c == '+'
|| c == 'x' || c == 'X'
|| isHexChar(c);
return c < 0x80 && (c == '-' || c == '+' || isdigit(c)
|| ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F')
|| c == 'x' || c == 'X');
}
template <typename ValueType>

27
src/support/lstrings.cpp
View File

@ -147,13 +147,13 @@ bool isSpace(char_type c)
}
bool isNumber(char_type c)
bool isDigit(char_type c)
{
if (!is_utf16(c))
// assume that no non-utf16 character is a numeral
// assume that no non-utf16 character is a digit
// c outside the UCS4 range is catched as well
return false;
return ucs4_to_qchar(c).isNumber();
return ucs4_to_qchar(c).isDigit();
}
@ -165,7 +165,8 @@ bool isDigitASCII(char_type c)
bool isAlnumASCII(char_type c)
{
return isAlphaASCII(c) || isDigitASCII(c);
return ('0' <= c && c <= '9')
|| ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z');
}
@ -265,7 +266,7 @@ bool isStrInt(string const & str)
string::const_iterator end = tmpstr.end();
for (; cit != end; ++cit)
if (!isDigitASCII(*cit))
if (!isdigit((*cit)))
return false;
return true;
@ -285,7 +286,7 @@ bool isStrUnsignedInt(string const & str)
string::const_iterator cit = tmpstr.begin();
string::const_iterator end = tmpstr.end();
for (; cit != end; ++cit)
if (!isDigitASCII(*cit))
if (!isdigit((*cit)))
return false;
return true;
@ -309,7 +310,7 @@ bool isStrDbl(string const & str)
++cit;
string::const_iterator end = tmpstr.end();
for (; cit != end; ++cit) {
if (!isDigitASCII(*cit) && *cit != '.')
if (!isdigit(*cit) && *cit != '.')
return false;
if ('.' == (*cit)) {
if (found_dot)
@ -321,13 +322,19 @@ bool isStrDbl(string const & str)
}
bool hasDigitASCII(docstring const & str)
bool hasDigit(docstring const & str)
{
if (str.empty())
return false;
docstring::const_iterator cit = str.begin();
docstring::const_iterator const end = str.end();
for (; cit != end; ++cit)
if (isDigitASCII(*cit))
for (; cit != end; ++cit) {
if (*cit == ' ')
continue;
if (isdigit((*cit)))
return true;
}
return false;
}

2
src/support/lstrings.h
View File

@ -45,7 +45,7 @@ bool isStrUnsignedInt(std::string const & str);
bool isStrDbl(std::string const & str);
/// does the string contain a digit?
bool hasDigitASCII(docstring const & str);
bool hasDigit(docstring const & str);
bool isHex(docstring const & str);

4
src/support/textutils.h
View File

@ -41,8 +41,8 @@ bool isPrintableNonspace(char_type c);
/// return true if a unicode char is a space.
bool isSpace(char_type c);
/// return true if a unicode char is a numeral.
bool isNumber(char_type c);
/// return true if a unicode char is a digit.
bool isDigit(char_type c);
/// return whether \p c is a digit in the ASCII range
bool isDigitASCII(char_type c);