anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

patch from Levon

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1246 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2000-11-29 15:34:56 +00:00
parent 037d17588d
commit 5ecd210835
4 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2000-11-29 John Levon <moz@compsoc.man.ac.uk>
* src/lyx_rc.C: more detail for the printer program config
dialog.
* src/LColor.C: ert->latex text. LColor needs a big revamp
but will have to wait till after 1.1.6
* src/buffer.C: bring up a dialog if we load a document
with an un-installed text class, rather than just complain
on the console.
2000-11-29 Angus Leeming <a.leeming@ic.ac.uk>
* src/combox.[Ch] )(add, Show): workaround xforms bug when Show()ing

2
src/LColor.C
View File

@ -85,7 +85,7 @@ LColor::LColor()
{ footnote, N_("footnote"), "footnote", "DarkRed", "footnote" },
{ footnotebg, N_("footnote background"), "footnotebg", "grey60", "footnotebg" },
{ footnoteframe, N_("footnote frame"), "footnoteframe", "IndianRed", "footnoteframe" },
{ ert, N_("ert"), "ert", "DarkRed", "ert" },
{ ert, N_("latex text"), "ert", "DarkRed", "ert" },
{ inset, N_("inset"), "inset", "black", "inset" },
{ insetbg, N_("inset background"), "insetbg", "grey60", "insetbg" },
{ insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" },

5
src/buffer.C
View File

@ -485,7 +485,10 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
if (pp.first) {
params.textclass = pp.second;
} else {
lex.printError("Unknown textclass `$$Token'");
WriteAlert(string(_("Textclass error")),
string(_("The document uses an unknown textclass \"")) +
lex.GetString() + string("\"."),
string(_("LyX will not be able to produce output correctly.")));
params.textclass = 0;
}
if (!textclasslist.Load(params.textclass)) {

26
src/lyxrc.C
View File

@ -1595,15 +1595,39 @@ string const LyXRC::getDescription(LyXRCTags tag)
break;
case RC_PRINTEVENPAGEFLAG:
str = N_("The option to print only even pages.");
break;
case RC_PRINTODDPAGEFLAG:
str = N_("The option to print only odd pages.");
break;
case RC_PRINTPAGERANGEFLAG:
str = N_("The option for specifying a comma-separated list of pages to print.");
break;
case RC_PRINTCOPIESFLAG:
str = N_("The option for specifying the number of copies to print.");
break;
case RC_PRINTCOLLCOPIESFLAG:
str = N_("The option for specifying whether the copies should be collated.");
break;
case RC_PRINTREVERSEFLAG:
str = N_("The option to reverse the order of the pages printed.");
break;
case RC_PRINTLANDSCAPEFLAG:
str = N_("The option to print out in landscape.");
break;
case RC_PRINTPAPERFLAG:
str = N_("The option to specify paper type.");
break;
case RC_PRINTPAPERDIMENSIONFLAG:
str = N_("Look at the man page for your favorite print program to learn which options to use.");
str = N_("Option to specify the dimensions of the print paper.");
break;
case RC_PRINTTOPRINTER: