* Licence details can be found in the file COPYING.
*
* \author Dekel Tsur
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
* \author Richard Heck
*
* Full author contact details are available in file CREDITS.
#include "Length.h"
#include "TextClass.h"
+#include "support/convert.h"
#include "support/debug.h"
#include "support/filetools.h"
#include "support/foreach.h"
#include "support/lyxalgo.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
#include "support/Systemcall.h"
#include <QCheckBox>
#include <QComboBox>
#include <QLineEdit>
+#include <QLocale>
#include <QPalette>
#include <QSet>
// for FileFilter.
// FIXME: Remove
-#include <boost/regex.hpp>
+#include "support/regex.h"
#include <boost/tokenizer.hpp>
}
+FileName imageLibFileSearch(QString & dir, QString const & name,
+ QString const & ext)
+{
+ string tmp = fromqstr(dir);
+ FileName fn = support::imageLibFileSearch(tmp, fromqstr(name), fromqstr(ext));
+ dir = toqstr(tmp);
+ return fn;
+}
+
+namespace {
+
+double locstringToDouble(QString const & str)
+{
+ QLocale loc;
+ bool ok;
+ double res = loc.toDouble(str, &ok);
+ if (!ok) {
+ // Fall back to C
+ QLocale c(QLocale::C);
+ res = c.toDouble(str);
+ }
+ return res;
+}
+
+} // namespace anon
+
+
namespace frontend {
string widgetsToLength(QLineEdit const * input, LengthCombo const * combo)
Length::UNIT const unit = combo->currentLengthItem();
- return Length(length.toDouble(), unit).asString();
+ return Length(locstringToDouble(length.trimmed()), unit).asString();
}
if (isValidGlueLength(fromqstr(length)))
return Length(fromqstr(length));
- Length::UNIT const unit = unitFromString(fromqstr(combo->currentText()));
+ Length::UNIT unit = Length::UNIT_NONE;
+ QString const item = combo->currentText();
+ for (int i = 0; i < num_units; i++) {
+ if (qt_(lyx::unit_name_gui[i]) == item) {
+ unit = unitFromString(unit_name[i]);
+ break;
+ }
+ }
- return Length(length.toDouble(), unit);
+ return Length(locstringToDouble(length.trimmed()), unit);
}
void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
- Length const & len, Length::UNIT /*defaultUnit*/)
+ Length const & len, Length::UNIT /*defaultUnit*/)
{
- combo->setCurrentItem(len.unit());
- input->setText(QString::number(Length(len).value()));
+ if (len.empty()) {
+ // no length (UNIT_NONE)
+ combo->setCurrentItem(Length::defaultUnit());
+ input->setText("");
+ } else {
+ combo->setCurrentItem(len.unit());
+ QLocale loc;
+ loc.setNumberOptions(QLocale::OmitGroupSeparator);
+ input->setText(loc.toString(Length(len).value()));
+ }
}
}
-void lengthAutoToWidgets(QLineEdit * input, LengthCombo * combo,
- Length const & len, Length::UNIT defaultUnit)
+void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
+ docstring const & len, Length::UNIT defaultUnit)
+{
+ lengthToWidgets(input, combo, to_utf8(len), defaultUnit);
+}
+
+
+double widgetToDouble(QLineEdit const * input)
+{
+ QString const text = input->text();
+ if (text.isEmpty())
+ return 0.0;
+
+ return locstringToDouble(text.trimmed());
+}
+
+
+string widgetToDoubleStr(QLineEdit const * input)
{
- if (len.value() == 0)
- lengthToWidgets(input, combo, "auto", defaultUnit);
- else
- lengthToWidgets(input, combo, len, defaultUnit);
+ return convert<string>(widgetToDouble(input));
+}
+
+
+void doubleToWidget(QLineEdit * input, double const & value, char f, int prec)
+{
+ QLocale loc;
+ loc.setNumberOptions(QLocale::OmitGroupSeparator);
+ input->setText(loc.toString(value, f, prec));
+}
+
+
+void doubleToWidget(QLineEdit * input, string const & value, char f, int prec)
+{
+ doubleToWidget(input, convert<double>(value), f, prec);
}
}
}
+/// wrapper to hide the change of method name to setSectionResizeMode
+void setSectionResizeMode(QHeaderView * view,
+ int logicalIndex, QHeaderView::ResizeMode mode) {
+#if (QT_VERSION >= 0x050000)
+ view->setSectionResizeMode(logicalIndex, mode);
+#else
+ view->setResizeMode(logicalIndex, mode);
+#endif
+}
+
+void setSectionResizeMode(QHeaderView * view, QHeaderView::ResizeMode mode) {
+#if (QT_VERSION >= 0x050000)
+ view->setSectionResizeMode(mode);
+#else
+ view->setResizeMode(mode);
+#endif
+}
} // namespace frontend
QString const qt_(char const * str, const char *)
}
-void rescanTexStyles()
+QString const qt_(QString const & qstr)
+{
+ return toqstr(_(fromqstr(qstr)));
+}
+
+
+void rescanTexStyles(string const & arg)
{
// Run rescan in user lyx directory
PathChanger p(package().user_support());
- FileName const command = support::libFileSearch("scripts", "TeXFiles.py");
+ FileName const prog = support::libFileSearch("scripts", "TeXFiles.py");
Systemcall one;
- int const status = one.startscript(Systemcall::Wait,
- os::python() + ' ' +
- quoteName(command.toFilesystemEncoding()));
+ string const command = os::python() + ' ' +
+ quoteName(prog.toFilesystemEncoding()) + ' ' +
+ arg;
+ int const status = one.startscript(Systemcall::Wait, command);
if (status == 0)
return;
// FIXME UNICODE
frontend::Alert::error(_("Could not update TeX information"),
- bformat(_("The script `%s' failed."), from_utf8(command.absFilename())));
+ bformat(_("The script `%1$s' failed."), from_utf8(prog.absFileName())));
}
return QList<QString>::fromSet(set);
}
+QString const externalLineEnding(docstring const & str)
+{
+#ifdef Q_WS_MACX
+ // The MAC clipboard uses \r for lineendings, and we use \n
+ return toqstr(subst(str, '\n', '\r'));
+#elif defined(Q_WS_WIN)
+ // Windows clipboard uses \r\n for lineendings, and we use \n
+ return toqstr(subst(str, from_ascii("\n"), from_ascii("\r\n")));
+#else
+ return toqstr(str);
+#endif
+}
+
+
+docstring const internalLineEnding(QString const & str)
+{
+ docstring const s = subst(qstring_to_ucs4(str),
+ from_ascii("\r\n"), from_ascii("\n"));
+ return subst(s, '\r', '\n');
+}
+
QString internalPath(const QString & str)
{
}
-QString onlyFilename(const QString & str)
+QString onlyFileName(const QString & str)
{
- return toqstr(support::onlyFilename(fromqstr(str)));
+ return toqstr(support::onlyFileName(fromqstr(str)));
}
QString makeAbsPath(QString const & relpath, QString const & base)
{
return toqstr(support::makeAbsPath(fromqstr(relpath),
- fromqstr(base)).absFilename());
+ fromqstr(base)).absFileName());
}
static string const convert_brace_glob(string const & glob)
{
// Matches " *.{abc,def,ghi}", storing "*." as group 1 and
- // "abc,def,ghi" as group 2.
- static boost::regex const glob_re(" *([^ {]*)\\{([^ }]+)\\}");
- // Matches "abc" and "abc,", storing "abc" as group 1.
- static boost::regex const block_re("([^,}]+),?");
+ // "abc,def,ghi" as group 2, while allowing spaces in group 2.
+ static lyx::regex const glob_re(" *([^ {]*)\\{([^}]+)\\}");
+ // Matches "abc" and "abc,", storing "abc" as group 1,
+ // while ignoring surrounding spaces.
+ static lyx::regex const block_re(" *([^ ,}]+) *,? *");
string pattern;
string::const_iterator it = glob.begin();
string::const_iterator const end = glob.end();
while (true) {
- boost::match_results<string::const_iterator> what;
- if (!boost::regex_search(it, end, what, glob_re)) {
+ match_results<string::const_iterator> what;
+ if (!regex_search(it, end, what, glob_re)) {
// Ensure that no information is lost.
pattern += string(it, end);
break;
// Split the ','-separated chunks of tail so that
// $head{$chunk1,$chunk2} becomes "$head$chunk1 $head$chunk2".
string const fmt = " " + head + "$1";
- pattern += boost::regex_merge(tail, block_re, fmt);
+ pattern += regex_replace(tail, block_re, fmt);
// Increment the iterator to the end of the match.
it += distance(it, what[0].second);
{
QString s;
- bool const has_description = desc_.empty();
+ bool const has_description = !desc_.empty();
if (has_description) {
s += toqstr(desc_);
// Split data such as "TeX documents (*.tex);;LyX Documents (*.lyx)"
// into individual filters.
- static boost::regex const separator_re(";;");
+ static lyx::regex const separator_re(";;");
string::const_iterator it = filter.begin();
string::const_iterator const end = filter.end();
while (true) {
- boost::match_results<string::const_iterator> what;
+ match_results<string::const_iterator> what;
- if (!boost::regex_search(it, end, what, separator_re)) {
+ if (!lyx::regex_search(it, end, what, separator_re)) {
parse_filter(string(it, end));
break;
}
void FileFilterList::parse_filter(string const & filter)
{
- // Matches "TeX documents (*.tex)",
- // storing "TeX documents " as group 1 and "*.tex" as group 2.
- static boost::regex const filter_re("([^(]*)\\(([^)]+)\\) *$");
+ // Matches "TeX documents (plain) (*.tex)",
+ // storing "TeX documents (plain) " as group 1 and "*.tex" as group 2.
+ static lyx::regex const filter_re("(.*)\\(([^()]+)\\) *$");
- boost::match_results<string::const_iterator> what;
- if (!boost::regex_search(filter, what, filter_re)) {
+ match_results<string::const_iterator> what;
+ if (!lyx::regex_search(filter, what, filter_re)) {
// Just a glob, no description.
filters_.push_back(Filter(docstring(), trim(filter)));
} else {
if (type == "child")
return qt_("Child Documents");
if (type == "graphics")
- return qt_("List of Graphics");
+ return qt_("Graphics");
if (type == "equation")
- return qt_("List of Equations");
+ return qt_("Equations");
if (type == "footnote")
- return qt_("List of Footnotes");
+ return qt_("Footnotes");
if (type == "listing")
- return qt_("List of Listings");
+ return qt_("Listings");
if (type == "index")
- return qt_("List of Indexes");
+ return qt_("Index Entries");
if (type == "marginalnote")
- return qt_("List of Marginal notes");
+ return qt_("Marginal notes");
+ if (type == "nomencl")
+ return qt_("Nomenclature Entries");
if (type == "note")
- return qt_("List of Notes");
+ return qt_("Notes");
if (type == "citation")
- return qt_("List of Citations");
+ return qt_("Citations");
if (type == "label")
return qt_("Labels and References");
if (type == "branch")
- return qt_("List of Branches");
+ return qt_("Branches");
+ if (type == "change")
+ return qt_("Changes");
FloatList const & floats = bp.documentClass().floats();
if (floats.typeExist(type))
projects / lyx.git / blobdiff