anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor bits 'n' bobs from Michael, J�rgen and Jean-Marc.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5906 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-01-06 14:02:24 +00:00
parent 74c871a9fc
commit 691568ea39
26 changed files with 102 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ChangeLog
View File

@ -1,3 +1,15 @@
2003-01-06 Michael Schmitt <Michael.Schmitt@teststep.org>
* LColor.C:
* LaTeX.C:
* LyXAction.C:
* MenuBackend.C:
* buffer.C:
* exporter.C:
* lyxfunc.C:
* lyxrc.C: fix inconsistent usage of spaces, colons, capitalization,
and the like.
2003-01-05 John Levon <levon@movementarian.org>
* BufferView.h:

2
src/LColor.C
View File

@ -59,7 +59,7 @@ LColor::LColor()
{ background, N_("background"), "background", "linen", "background" },
{ foreground, N_("text"), "foreground", "black", "foreground" },
{ selection, N_("selection"), "selection", "LightBlue", "selection" },
{ latex, N_("latex text"), "latex", "DarkRed", "latex" },
{ latex, N_("LaTeX text"), "latex", "DarkRed", "latex" },
{ preview, N_("previewed snippet"), "preview", "black", "preview" },
{ note, N_("note"), "note", "yellow", "note" },
{ notebg, N_("note background"), "notebg", "yellow", "notebg" },

4
src/LaTeX.C
View File

@ -472,7 +472,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
string database;
data = split(data, database, ',');
database = ChangeExtension(database, "bib");
lyxerr[Debug::LATEX] << "Bibtex database: `"
lyxerr[Debug::LATEX] << "BibTeX database: `"
<< database << '\'' << endl;
aux_info.databases.insert(database);
}
@ -481,7 +481,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
// token is now the style file
// pass it to the helper
style = ChangeExtension(style, "bst");
lyxerr[Debug::LATEX] << "Bibtex style: `"
lyxerr[Debug::LATEX] << "BibTeX style: `"
<< style << '\'' << endl;
aux_info.styles.insert(style);
} else if (regex_match(STRCONV(token), sub, reg4)) {

2
src/LyXAction.C
View File

@ -106,7 +106,7 @@ void LyXAction::init()
N_("Select previous char"), ReadOnly },
{ LFUN_BIBDB_ADD, "bibtex-database-add", "", Noop },
{ LFUN_BIBDB_DEL, "bibtex-database-del", "", Noop },
{ LFUN_INSERT_BIBTEX, "bibtex-insert", N_("Insert bibtex"),
{ LFUN_INSERT_BIBTEX, "bibtex-insert", N_("Insert BibTeX"),
Noop },
{ LFUN_BIBTEX_STYLE, "bibtex-style", "", Noop },
{ LFUN_BOOKMARK_GOTO, "bookmark-goto", "", ReadOnly },

4
src/MenuBackend.C
View File

@ -375,9 +375,9 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
if (kind == MenuItem::ImportFormats)
if ((*fit)->name() == "text")
label = _("Ascii text as lines");
label = _("ASCII text as lines");
else if ((*fit)->name() == "textparagraph")
label = _("Ascii text as paragraphs");
label = _("ASCII text as paragraphs");
if (!(*fit)->shortcut().empty())
label += '|' + (*fit)->shortcut();
int const action2 = lyxaction.

12
src/buffer.C
View File

@ -227,10 +227,10 @@ pair<Buffer::LogType, string> const Buffer::getLogName() const
if (b_fi.exist() &&
(!f_fi.exist() || f_fi.getModificationTime() < b_fi.getModificationTime())) {
lyxerr[Debug::FILES] << "Log name calculated as : " << bname << endl;
lyxerr[Debug::FILES] << "Log name calculated as: " << bname << endl;
return make_pair(Buffer::buildlog, bname);
}
lyxerr[Debug::FILES] << "Log name calculated as : " << fname << endl;
lyxerr[Debug::FILES] << "Log name calculated as: " << fname << endl;
return make_pair(Buffer::latexlog, fname);
}
@ -2140,7 +2140,7 @@ void Buffer::makeLaTeXFile(ostream & os,
// Just to be sure. (Asger)
texrow.newline();
lyxerr[Debug::INFO] << "Finished making latex file." << endl;
lyxerr[Debug::INFO] << "Finished making LaTeX file." << endl;
lyxerr[Debug::INFO] << "Row count was " << texrow.rows() - 1
<< '.' << endl;
@ -2328,8 +2328,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
case LATEX_COMMAND:
if (depth!= 0)
sgmlError(par, 0,
_("Error : Wrong depth for"
" LatexType Command.\n"));
_("Error: Wrong depth for LatexType Command.\n"));
if (!environment_stack[depth].empty()) {
sgml::closeTag(ofs, depth, false, environment_stack[depth]);
@ -2802,8 +2801,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
case LATEX_COMMAND:
if (depth != 0)
sgmlError(par, 0,
_("Error : Wrong depth for "
"LatexType Command.\n"));
_("Error: Wrong depth for LatexType Command.\n"));
command_name = style->latexname();

2
src/exporter.C
View File

@ -86,7 +86,7 @@ bool Exporter::Export(Buffer * buffer, string const & format,
else if (backend_format == format)
buffer->makeLaTeXFile(filename, string(), true);
else if (contains(buffer->filePath(), ' ')) {
Alert::alert(_("Cannot run latex."),
Alert::alert(_("Cannot run LaTeX."),
_("The path to the lyx file cannot contain spaces."));
return false;
} else

9
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,12 @@
2003-01-06 Michael Schmitt <Michael.Schmitt@teststep.org>
* FileDialog.C:
* QIndexDialog.C:
* QPrefsDialog.C:
* QToc.C:
* qfont_loader.C: fix inconsistent usage of spaces, colons,
capitalization, and the like.
2003-01-05 John Levon <levon@movementarian.org>
* QLyXKeySym.h:

4
src/frontends/qt2/FileDialog.C
View File

@ -71,7 +71,7 @@ FileDialog::Result const FileDialog::save(string const & path,
dlg.setSelection(toqstr(suggested));
FileDialog::Result result;
lyxerr[Debug::GUI] << "Synchronous FileDialog : " << endl;
lyxerr[Debug::GUI] << "Synchronous FileDialog: " << endl;
result.first = FileDialog::Chosen;
int res = dlg.exec();
lyxerr[Debug::GUI] << "result " << res << endl;
@ -99,7 +99,7 @@ FileDialog::Result const FileDialog::open(string const & path,
dlg.setSelection(toqstr(suggested));
FileDialog::Result result;
lyxerr[Debug::GUI] << "Synchronous FileDialog : " << endl;
lyxerr[Debug::GUI] << "Synchronous FileDialog: " << endl;
result.first = FileDialog::Chosen;
int res = dlg.exec();
lyxerr[Debug::GUI] << "result " << res << endl;

4
src/frontends/qt2/QIndexDialog.C
View File

@ -37,11 +37,11 @@ QIndexDialog::QIndexDialog(QIndex * form)
"The format of the entry in the index.\n"
"\n"
"An entry can be specified as a sub-entry of\n"
"another with \"!\" :\n"
"another with \"!\":\n"
"\n"
"cars!mileage\n"
"\n"
"You can cross-refer to another entry like so :\n"
"You can cross-refer to another entry like so:\n"
"\n"
"cars!mileage|see{economy}\n"
"\n"

2
src/frontends/qt2/QPrefsDialog.C
View File

@ -139,7 +139,7 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
// output
i = new QListViewItem(out, qt_("Ascii"));
i = new QListViewItem(out, qt_("ASCII"));
pane_map_[i] = asciiModule;
i = new QListViewItem(out, i, qt_("Date format"));
pane_map_[i] = dateModule;

2
src/frontends/qt2/QToc.C
View File

@ -171,7 +171,7 @@ void QToc::select(string const & text)
}
if (iter == toclist.end()) {
lyxerr[Debug::GUI] << "Couldn't find highlighted TOC entry : "
lyxerr[Debug::GUI] << "Couldn't find highlighted TOC entry: "
<< text << endl;
return;
}

2
src/frontends/qt2/qfont_loader.C
View File

@ -168,7 +168,7 @@ QFont const getSymbolFont(string const & family)
return font;
}
lyxerr[Debug::FONT] << " FAILED :(" << endl;
lyxerr[Debug::FONT] << " FAILED :-(" << endl;
return font;
}

19
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,22 @@
2003-01-06 Michael Schmitt <Michael.Schmitt@teststep.org>
* FormGraphics.C:
* xformsImage.C:
* forms/form_bibtex.fd:
* forms/form_citation.fd:
* forms/form_document.fd:
* forms/form_search.fd: fix inconsistent usage of spaces, colons,
capitalization, and the like.
2002-12-20 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* FormTabular.C: fix bug 572, fix ReadOnly logic.
2003-01-06 Angus Leeming <leeming@lyx.org>
* forms/fdfixc.sed: Turn off choice titles as they can contain
meta-chars that just look nasty.
2003-01-05 John Levon <levon@movementarian.org>
* XLyXKeySym.h:

2
src/frontends/xforms/FormGraphics.C
View File

@ -256,7 +256,7 @@ void FormGraphics::build()
tooltips().init(extra_->check_subcaption, str);
str = _("Insert the optional subfigure caption.");
tooltips().init(extra_->input_subcaption, str);
str = _("Add any additional latex option, which is defined in the "
str = _("Add any additional LaTeX option, which is defined in the "
"graphicx-package and not mentioned in the gui's tabfolders.");
tooltips().init(extra_->input_special, str);

14
src/frontends/xforms/FormTabular.C
View File

@ -188,12 +188,16 @@ void FormTabular::update()
}
pwidth = tabular->GetMColumnPWidth(cell);
align = tabular->GetAlignment(cell);
if (align == LYX_ALIGN_LEFT)
fl_set_button(cell_options_->radio_align_left, 1);
else if (align == LYX_ALIGN_RIGHT)
// set the horiz. alignment, default is left here
fl_set_button(column_options_->radio_align_left, 0);
fl_set_button(column_options_->radio_align_right, 0);
fl_set_button(column_options_->radio_align_center, 0);
if (align == LYX_ALIGN_RIGHT)
fl_set_button(cell_options_->radio_align_right, 1);
else
else if (align == LYX_ALIGN_CENTER)
fl_set_button(cell_options_->radio_align_center, 1);
else
fl_set_button(cell_options_->radio_align_left, 1);
align = tabular->GetVAlignment(cell);
fl_set_button(cell_options_->radio_valign_top, 0);
@ -214,7 +218,7 @@ void FormTabular::update()
cell_options_->choice_value_mcolumn_width,
pwidth, default_unit);
if (bc().bp().isReadOnly()) {
if (!bc().bp().isReadOnly()) {
setEnabled(cell_options_->input_special_multialign, true);
setEnabled(cell_options_->input_mcolumn_width, true);
setEnabled(cell_options_->choice_value_mcolumn_width, true);

7
src/frontends/xforms/forms/fdfixc.sed
View File

@ -74,6 +74,13 @@ s/\( fdui->form\)\(.*bgn_form.*\)/\1\2\
/bmtable/ s/fl_add_button/fl_add_bmtable/
# For all lines containing fl_add_choice,
# add a line that turns off the title. (These titles can contain meta-chars
# that just look nasty ;-)
/fl_add_choice/a\
fl_set_choice_notitle(obj, 1);
# For all lines containing "fl_" and a string _not_ containing |,
# replace the string with _(string)
/fl_/ s/".[^|]*"/_(&)/

2
src/frontends/xforms/forms/form_bibtex.fd
View File

@ -167,7 +167,7 @@ alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Styles|#y
label: Styles:|#y
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_North FL_South

6
src/frontends/xforms/forms/form_citation.fd
View File

@ -41,7 +41,7 @@ alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Inset keys|#I
label: Inset keys:|#I
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NorthWest FL_South
@ -59,7 +59,7 @@ alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Bibliography keys|#k
label: Bibliography keys:|#k
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_North FL_SouthEast
@ -77,7 +77,7 @@ alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Info
label: Info:
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast

10
src/frontends/xforms/forms/form_document.fd
View File

@ -863,7 +863,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Spacing|#g
label: Spacing:|#g
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
@ -1398,7 +1398,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Section number depth
label: Section number depth:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
@ -1420,7 +1420,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Table of contents depth
label: Table of contents depth:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
@ -1442,7 +1442,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: PS Driver|#S
label: PS Driver:|#S
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
@ -1496,7 +1496,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Citation style|#i
label: Citation style:|#i
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity

4
src/frontends/xforms/forms/form_search.fd
View File

@ -41,7 +41,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Find|#F
label: Find:|#F
shortcut:
resize: FL_RESIZE_X
gravity: FL_West FL_East
@ -59,7 +59,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Replace with|#w
label: Replace with:|#w
shortcut:
resize: FL_RESIZE_X
gravity: FL_West FL_East

4
src/frontends/xforms/xformsImage.C
View File

@ -382,7 +382,7 @@ int status_report(FL_IMAGE * ob, const char *s)
return 0;
lyxerr[Debug::GRAPHICS]
<< "xforms image loader. Status : " << str << std::endl;
<< "xforms image loader. Status: " << str << std::endl;
grfx::xformsImage * ptr =
static_cast<grfx::xformsImage *>(ob->u_vdata);
@ -401,7 +401,7 @@ static void error_report(FL_IMAGE * ob, const char *s)
return;
lyxerr[Debug::GRAPHICS]
<< "xforms image loader. Error : " << str << std::endl;
<< "xforms image loader. Error: " << str << std::endl;
grfx::xformsImage * ptr =
static_cast<grfx::xformsImage *>(ob->u_vdata);

5
src/insets/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-06 Michael Schmitt <Michael.Schmitt@teststep.org>
* insettext.C: fix inconsistent usage of spaces, colons, capitalization,
and the like.
2002-12-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* insetgraphics.C (prepareFile): do not remove the extension of

2
src/insets/insettext.C
View File

@ -1666,7 +1666,7 @@ int InsetText::docbook(Buffer const * buf, ostream & os, bool mixcont) const
break;
case LATEX_COMMAND:
buf->sgmlError(p, 0, _("Error : LatexType Command not allowed here.\n"));
buf->sgmlError(p, 0, _("Error: LatexType Command not allowed here.\n"));
return -1;
break;

4
src/lyxfunc.C
View File

@ -1712,7 +1712,7 @@ void LyXFunc::open(string const & fname)
if (!f.exist()) {
if (!Alert::askQuestion(_("No such file"), disp_fn,
_("Start a new document with this filename ?"))) {
owner->message(_("Canceled"));
owner->message(_("Canceled."));
return;
}
// the user specifically chose this name. Believe them.
@ -1837,7 +1837,7 @@ void LyXFunc::doImport(string const & argument)
if (FileInfo(lyxfile, true).exist() && filename != lyxfile) {
if (!Alert::askQuestion(_("A document by the name"),
MakeDisplayPath(lyxfile), _("already exists. Overwrite?"))) {
owner->message(_("Canceled"));
owner->message(_("Canceled."));
return;
}
}

10
src/lyxrc.C
View File

@ -779,7 +779,7 @@ int LyXRC::read(string const & filename)
if (lexrc.next()) {
x11_name = lexrc.getString();
} else {
lexrc.printError("Missing color name for color : `$$Token'");
lexrc.printError("Missing color name for color: `$$Token'");
break;
}
@ -2083,7 +2083,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
break;
case RC_LANGUAGE_PACKAGE:
str = _("The latex command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
str = _("The LaTeX command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
break;
case RC_LANGUAGE_GLOBAL_OPTIONS:
@ -2103,15 +2103,15 @@ string const LyXRC::getDescription(LyXRCTags tag)
break;
case RC_LANGUAGE_COMMAND_BEGIN:
str = _("The latex command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language.");
str = _("The LaTeX command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language.");
break;
case RC_LANGUAGE_COMMAND_END:
str = _("The latex command for changing back to the language of the document.");
str = _("The LaTeX command for changing back to the language of the document.");
break;
case RC_LANGUAGE_COMMAND_LOCAL:
str = _("The latex command for local changing of the language.");
str = _("The LaTeX command for local changing of the language.");
break;
case RC_DATE_INSERT_FORMAT: