mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-11 03:03:06 +00:00
* fix spelling in comments to please John.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33262 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
167b6dc0f2
commit
425d092204
@ -1534,7 +1534,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
|
|||||||
// before hyperref. Then hyperref has a chance to detect babel.
|
// before hyperref. Then hyperref has a chance to detect babel.
|
||||||
// * Has to be loaded before the "LyX specific LaTeX commands" to
|
// * Has to be loaded before the "LyX specific LaTeX commands" to
|
||||||
// avoid errors with algorithm floats.
|
// avoid errors with algorithm floats.
|
||||||
// use hyperref explicitely when it is required
|
// use hyperref explicitly when it is required
|
||||||
if (features.isRequired("hyperref")) {
|
if (features.isRequired("hyperref")) {
|
||||||
odocstringstream oss;
|
odocstringstream oss;
|
||||||
pdfoptions().writeLaTeX(oss, documentClass().provides("hyperref"));
|
pdfoptions().writeLaTeX(oss, documentClass().provides("hyperref"));
|
||||||
@ -2261,7 +2261,7 @@ string const BufferParams::loadFonts(string const & rm,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ROMAN FONTS
|
// ROMAN FONTS
|
||||||
// Computer Modern (must be explicitely selectable -- there might be classes
|
// Computer Modern (must be explicitly selectable -- there might be classes
|
||||||
// that define a different default font!
|
// that define a different default font!
|
||||||
if (rm == "cmr") {
|
if (rm == "cmr") {
|
||||||
os << "\\renewcommand{\\rmdefault}{cmr}\n";
|
os << "\\renewcommand{\\rmdefault}{cmr}\n";
|
||||||
|
@ -343,7 +343,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
|
|||||||
{
|
{
|
||||||
DispatchResult dr;
|
DispatchResult dr;
|
||||||
// redraw the screen at the end (first of the two drawing steps).
|
// redraw the screen at the end (first of the two drawing steps).
|
||||||
//This is done unless explicitely requested otherwise
|
//This is done unless explicitly requested otherwise
|
||||||
dr.update(Update::FitCursor);
|
dr.update(Update::FitCursor);
|
||||||
dispatch(cmd, dr);
|
dispatch(cmd, dr);
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@ void PDFOptions::writeLaTeX(odocstream & os, bool hyperref_already_provided) con
|
|||||||
opt += "unicode=true, ";
|
opt += "unicode=true, ";
|
||||||
|
|
||||||
// try to extract author and title from document when none is
|
// try to extract author and title from document when none is
|
||||||
// explicitely given
|
// explicitly given
|
||||||
if (pdfusetitle && title.empty() && author.empty())
|
if (pdfusetitle && title.empty() && author.empty())
|
||||||
opt += "pdfusetitle,";
|
opt += "pdfusetitle,";
|
||||||
opt += "\n ";
|
opt += "\n ";
|
||||||
|
@ -377,7 +377,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
|
|||||||
bool TextMetrics::redoParagraph(pit_type const pit)
|
bool TextMetrics::redoParagraph(pit_type const pit)
|
||||||
{
|
{
|
||||||
Paragraph & par = text_->getPar(pit);
|
Paragraph & par = text_->getPar(pit);
|
||||||
// IMPORTANT NOTE: We pass 'false' explicitely in order to not call
|
// IMPORTANT NOTE: We pass 'false' explicitly in order to not call
|
||||||
// redoParagraph() recursively inside parMetrics.
|
// redoParagraph() recursively inside parMetrics.
|
||||||
Dimension old_dim = parMetrics(pit, false).dim();
|
Dimension old_dim = parMetrics(pit, false).dim();
|
||||||
ParagraphMetrics & pm = par_metrics_[pit];
|
ParagraphMetrics & pm = par_metrics_[pit];
|
||||||
|
@ -119,7 +119,7 @@ void GuiSetBorder::drawLeft(bool draw)
|
|||||||
{
|
{
|
||||||
QColor col(draw ? Qt::black : Qt::white);
|
QColor col(draw ? Qt::black : Qt::white);
|
||||||
if (!left_.enabled)
|
if (!left_.enabled)
|
||||||
col = QColor("grey");
|
col = QColor(Qt::lightGray);
|
||||||
drawLine(col, m + l, m + l + 2, m + l, h - m - l - 1);
|
drawLine(col, m + l, m + l + 2, m + l, h - m - l - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -128,7 +128,7 @@ void GuiSetBorder::drawRight(bool draw)
|
|||||||
{
|
{
|
||||||
QColor col(draw ? Qt::black : Qt::white);
|
QColor col(draw ? Qt::black : Qt::white);
|
||||||
if (!right_.enabled)
|
if (!right_.enabled)
|
||||||
col = QColor("grey");
|
col = QColor(Qt::lightGray);
|
||||||
drawLine(col, h - m - l + 1, m + l + 2, h - m - l + 1, h - m - l - 1);
|
drawLine(col, h - m - l + 1, m + l + 2, h - m - l + 1, h - m - l - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -137,7 +137,7 @@ void GuiSetBorder::drawTop(bool draw)
|
|||||||
{
|
{
|
||||||
QColor col(draw ? Qt::black : Qt::white);
|
QColor col(draw ? Qt::black : Qt::white);
|
||||||
if (!top_.enabled)
|
if (!top_.enabled)
|
||||||
col = QColor("grey");
|
col = QColor(Qt::lightGray);
|
||||||
drawLine(col, m + l + 2, m + l, w - m - l - 1, m + l);
|
drawLine(col, m + l + 2, m + l, w - m - l - 1, m + l);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -146,7 +146,7 @@ void GuiSetBorder::drawBottom(bool draw)
|
|||||||
{
|
{
|
||||||
QColor col(draw ? Qt::black : Qt::white);
|
QColor col(draw ? Qt::black : Qt::white);
|
||||||
if (!bottom_.enabled)
|
if (!bottom_.enabled)
|
||||||
col = QColor("grey");
|
col = QColor(Qt::lightGray);
|
||||||
drawLine(col, m + l + 2, w - m - l + 1, w - m - l - 1, w - m - l + 1);
|
drawLine(col, m + l + 2, w - m - l + 1, w - m - l - 1, w - m - l + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -37,49 +37,18 @@ private Q_SLOTS:
|
|||||||
void bottomspace_changed();
|
void bottomspace_changed();
|
||||||
void interlinespace_changed();
|
void interlinespace_changed();
|
||||||
void booktabsChanged(bool);
|
void booktabsChanged(bool);
|
||||||
void close_clicked();
|
|
||||||
void borderSet_clicked();
|
void borderSet_clicked();
|
||||||
void borderUnset_clicked();
|
void borderUnset_clicked();
|
||||||
void leftBorder_changed();
|
|
||||||
void rightBorder_changed();
|
|
||||||
void topBorder_changed();
|
|
||||||
void bottomBorder_changed();
|
|
||||||
void multicolumn_clicked();
|
|
||||||
void rotateTabular();
|
|
||||||
void rotateCell();
|
|
||||||
void hAlign_changed(int align);
|
|
||||||
void vAlign_changed(int align);
|
|
||||||
void tableAlignment_changed(int align);
|
|
||||||
void specialAlignment_changed();
|
|
||||||
void width_changed();
|
|
||||||
void longTabular();
|
|
||||||
void ltNewpage_clicked();
|
|
||||||
void ltHeaderStatus_clicked();
|
|
||||||
void ltHeaderBorderAbove_clicked();
|
|
||||||
void ltHeaderBorderBelow_clicked();
|
|
||||||
void ltFirstHeaderStatus_clicked();
|
|
||||||
void ltFirstHeaderBorderAbove_clicked();
|
|
||||||
void ltFirstHeaderBorderBelow_clicked();
|
|
||||||
void ltFirstHeaderEmpty_clicked();
|
|
||||||
void ltFooterStatus_clicked();
|
|
||||||
void ltFooterBorderAbove_clicked();
|
|
||||||
void ltFooterBorderBelow_clicked();
|
|
||||||
void ltLastFooterStatus_clicked();
|
|
||||||
void ltLastFooterBorderAbove_clicked();
|
|
||||||
void ltLastFooterBorderBelow_clicked();
|
|
||||||
void ltLastFooterEmpty_clicked();
|
|
||||||
void ltAlignment_clicked();
|
|
||||||
void on_captionStatusCB_toggled();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
///
|
///
|
||||||
bool isValid() { return true; }
|
bool isValid() { return true; }
|
||||||
/// update borders
|
/// update borders
|
||||||
void update_borders();
|
void update_borders();
|
||||||
|
///
|
||||||
|
void applyView();
|
||||||
/// update
|
/// update
|
||||||
void updateContents();
|
void updateContents();
|
||||||
/// save some values before closing the gui
|
|
||||||
void closeGUI();
|
|
||||||
///
|
///
|
||||||
bool initialiseParams(std::string const & data);
|
bool initialiseParams(std::string const & data);
|
||||||
/// clean-up on hide.
|
/// clean-up on hide.
|
||||||
@ -96,33 +65,14 @@ private:
|
|||||||
/// set a parameter
|
/// set a parameter
|
||||||
void set(Tabular::Feature, std::string const & arg = std::string());
|
void set(Tabular::Feature, std::string const & arg = std::string());
|
||||||
|
|
||||||
void setSpecial(std::string const & special);
|
|
||||||
|
|
||||||
void setWidth(std::string const & width);
|
|
||||||
|
|
||||||
void toggleMultiColumn();
|
|
||||||
|
|
||||||
void rotateTabular(bool yes);
|
|
||||||
void rotateCell(bool yes);
|
|
||||||
|
|
||||||
enum HALIGN { LEFT, RIGHT, CENTER, BLOCK };
|
|
||||||
|
|
||||||
void halign(HALIGN h);
|
|
||||||
|
|
||||||
enum VALIGN { TOP, MIDDLE, BOTTOM };
|
|
||||||
|
|
||||||
void valign(VALIGN h);
|
|
||||||
|
|
||||||
void booktabs(bool yes);
|
|
||||||
|
|
||||||
void longTabular(bool yes);
|
|
||||||
|
|
||||||
bool funcEnabled(Tabular::Feature f) const;
|
bool funcEnabled(Tabular::Feature f) const;
|
||||||
|
|
||||||
///
|
///
|
||||||
Tabular::idx_type active_cell_;
|
Tabular::idx_type active_cell_;
|
||||||
///
|
///
|
||||||
Tabular tabular_;
|
Tabular tabular_;
|
||||||
|
///
|
||||||
|
bool applying_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace frontend
|
} // namespace frontend
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -829,7 +829,7 @@ void latexParagraphs(Buffer const & buf,
|
|||||||
texrow.newline();
|
texrow.newline();
|
||||||
open_encoding_ = CJK;
|
open_encoding_ = CJK;
|
||||||
}
|
}
|
||||||
// if "auto begin" is switched off, explicitely switch the
|
// if "auto begin" is switched off, explicitly switch the
|
||||||
// language on at start
|
// language on at start
|
||||||
if (maintext && !lyxrc.language_auto_begin &&
|
if (maintext && !lyxrc.language_auto_begin &&
|
||||||
!bparams.language->babel().empty()) {
|
!bparams.language->babel().empty()) {
|
||||||
@ -903,7 +903,7 @@ void latexParagraphs(Buffer const & buf,
|
|||||||
texrow.newline();
|
texrow.newline();
|
||||||
}
|
}
|
||||||
|
|
||||||
// if "auto end" is switched off, explicitely close the language at the end
|
// if "auto end" is switched off, explicitly close the language at the end
|
||||||
// but only if the last par is in a babel language
|
// but only if the last par is in a babel language
|
||||||
if (maintext && !lyxrc.language_auto_end && !bparams.language->babel().empty() &&
|
if (maintext && !lyxrc.language_auto_end && !bparams.language->babel().empty() &&
|
||||||
lastpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK) {
|
lastpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK) {
|
||||||
|
Loading…
Reference in New Issue
Block a user