anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make InsetListings ready for dialects, part 1 (joint work with Bo Peng):

Browse Source 
* src/insets/InsetListingsParams.cpp:
	- complete list of languages/dialects
	- fix some typos
	- (validate): check for braces

* src/frontends/qt4/QListings.cpp:
	- fix list of languages (not yet complete)
	- make it possible to enter [dialect]language in the advanced widget

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18451 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2007-05-22 04:43:30 +00:00
parent 380e2dba82
commit cddcdd08ea
2 changed files with 120 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/frontends/qt4/QListings.cpp
View File

@ -34,6 +34,7 @@ using lyx::support::findToken;
using lyx::support::getVectorFromString;
using lyx::support::getStringFromVector;
using lyx::support::prefixIs;
using lyx::support::suffixIs;
using lyx::support::contains;
namespace lyx {
@ -47,19 +48,19 @@ namespace frontend {
char const * languages[] =
{ "no language", "BAP", "ACSL", "Ada", "ALGOL", "C", "C++", "Caml", "Clean", "Cobol",
{ "no language", "ABAP", "ACSL", "Ada", "ALGOL", "C", "C++", "Caml", "Clean", "Cobol",
"Comal 80", "csh", "Delphi", "Eiffel", "Elan", "Euphoria", "Fortran", "Haskell",
"HTML", "IDL", "Java", "Lisp", "Logo", "make", "Mathematica", "Matlab", "Mercury",
"Miranda", "ML", "Modula-2", "Oberon-2", "OCL", "Pascal", "Perl", "PHP", "PL/I", "POV",
"Python", "Prolog", "R", "S", "SAS", "SHELXL", "Simula", "tcl", "SQL", "TeX", "VBScript",
"Prolog", "Python", "R", "S", "SAS", "SHELXL", "Simula", "tcl", "SQL", "TeX", "VBScript",
"VHDL", "XML", "" };
char const * languages_gui[] =
{ N_("No language"), "BAP", "ACSL", "Ada", "ALGOL", "C", "C++", "Caml", "Clean", "Cobol",
{ N_("No language"), "ABAP", "ACSL", "Ada", "ALGOL", "C", "C++", "Caml", "Clean", "Cobol",
"Comal 80", "csh", "Delphi", "Eiffel", "Elan", "Euphoria", "Fortran", "Haskell",
"HTML", "IDL", "Java", "Lisp", "Logo", "make", "Mathematica", "Matlab", "Mercury",
"Miranda", "ML", "Modula-2", "Oberon-2", "OCL", "Pascal", "Perl", "PHP", "PL/I", "POV",
"Python", "Prolog", "R", "S", "SAS", "SHELXL", "Simula", "tcl", "SQL", "TeX", "VBScript",
"Prolog", "Python", "R", "S", "SAS", "SHELXL", "Simula", "tcl", "SQL", "TeX", "VBScript",
"VHDL", "XML", "" };
char const * font_sizes[] =
@ -181,7 +182,7 @@ string QListingsDialog::construct_params()
// compose a string
InsetListingsParams par;
if (language != "no language")
if (language != "no language" && !contains(extra, "language="))
par.addParam("language", language);
if (float_)
par.addParam("float", "");
@ -294,6 +295,19 @@ void QListings::apply()
}
namespace {
string plainParam(std::string const & par)
{
// remove enclosing braces
if (prefixIs(par, "{") && suffixIs(par, "}"))
return par.substr(1, par.size() - 2);
return par;
}
} //namespace anon
void QListings::update_contents()
{
// set default values
@ -326,13 +340,20 @@ void QListings::update_contents()
for (vector<string>::iterator it = pars.begin();
it != pars.end(); ++it) {
if (prefixIs(*it, "language=")) {
int n = findToken(languages, it->substr(9));
int n = findToken(languages, plainParam(it->substr(9)));
if (n >= 0) {
dialog_->languageCO->setEnabled(true);
dialog_->languageCO->setCurrentIndex(n);
*it = "";
}
else
// a known language that is not in the gui
dialog_->languageCO->setEnabled(false);
} else if (prefixIs(*it, "floatplacement=")) {
dialog_->floatCB->setChecked(true);
dialog_->placementLE->setEnabled(true);
dialog_->placementLE->setText(toqstr(it->substr(15)));
dialog_->placementLE->setText(
toqstr(plainParam(it->substr(15))));
dialog_->inlineCB->setChecked(false);
*it = "";
} else if (prefixIs(*it, "float")) {
@ -340,10 +361,11 @@ void QListings::update_contents()
dialog_->inlineCB->setChecked(false);
dialog_->placementLE->setEnabled(true);
if (prefixIs(*it, "float="))
dialog_->placementLE->setText(toqstr(it->substr(6)));
dialog_->placementLE->setText(
toqstr(plainParam(it->substr(6))));
*it = "";
} else if (prefixIs(*it, "numbers=")) {
string s = it->substr(8);
string s = plainParam(it->substr(8));
int n = 0;
if (s == "left")
n = 1;
@ -352,17 +374,22 @@ void QListings::update_contents()
dialog_->numberSideCO->setCurrentIndex(n);
*it = "";
} else if (prefixIs(*it, "stepnumber=")) {
dialog_->numberStepLE->setText(toqstr(it->substr(11)));
dialog_->numberStepLE->setText(
toqstr(plainParam(it->substr(11))));
*it = "";
} else if (prefixIs(*it, "numberstyle=")) {
int n = findToken(font_sizes, it->substr(13));
string par = plainParam(it->substr(12));
int n = findToken(font_sizes, par.substr(1));
if (n >= 0)
dialog_->numberFontSizeCO->setCurrentIndex(n);
*it = "";
} else if (prefixIs(*it, "firstline=")) {
dialog_->firstlineLE->setText(toqstr(it->substr(10)));
dialog_->firstlineLE->setText(
toqstr(plainParam(it->substr(10))));
*it = "";
} else if (prefixIs(*it, "lastline=")) {
dialog_->lastlineLE->setText(toqstr(it->substr(9)));
dialog_->lastlineLE->setText(
toqstr(plainParam(it->substr(9))));
*it = "";
} else if (prefixIs(*it, "basicstyle=")) {
string style;
@ -381,13 +408,18 @@ void QListings::update_contents()
break;
}
}
if (it->substr(11) == style + size || it->substr(11) == size + style) {
if (!style.empty())
dialog_->fontstyleCO->setCurrentIndex(
findToken(font_styles, style.substr(1)));
if (!size.empty())
dialog_->fontsizeCO->setCurrentIndex(
findToken(font_sizes, size.substr(1)));
if (plainParam(it->substr(11)) == style + size
|| plainParam(it->substr(11)) == size + style) {
if (!style.empty()) {
int n = findToken(font_styles, style.substr(1));
if (n >= 0)
dialog_->fontstyleCO->setCurrentIndex(n);
}
if (!size.empty()) {
int n = findToken(font_sizes, size.substr(1));
if (n >= 0)
dialog_->fontsizeCO->setCurrentIndex(n);
}
*it = "";
}
} else if (prefixIs(*it, "breaklines=")) {

88
src/insets/InsetListingsParams.cpp
View File

@ -79,17 +79,35 @@ struct listings_param_info {
};
char const * allowed_languages =
"no language\nBAP\nACSL\nAda\nALGOL\nC\nC++\nCaml\nClean\nCobol\n"
"Comal 80\ncsh\nDelphi\nEiffel\nElan\nEuphoria\nFortran\nHaskell\n"
"HTML\nIDL\nJava\nLisp\nLogo\nmake\nMathematica\nMatlab\nMercury\n"
"Miranda\nML\nModula-2\nOberon-2\nOCL\nPascal\nPerl\nPHP\nPL/I\nPOV\n"
"Python\nProlog\nR\nS\nSAS\nSHELXL\nSimula\ntcl\nSQL\nTeX\nVBScript\n"
"VHDL\nXML";
char const * style_hint = "Use \\footnotessize, \\small, \\itshape, \\ttfamily or something like that";
/// languages and language/dialect combinations
char const * allowed_languages =
"no language\nABAP\n[R/2 4.3]ABAP\n[R/2 5.0]ABAP\n[R/3 3.1]ABAP\n"
"[R/3 4.6C]ABAP\n[R/3 6.10]ABAP\nACSL\nAda\n[2005]Ada\n[83]Ada\n"
"[95]Ada\nALGOL\n[60]ALGOL\n[68]ALGOL\nAssembler\n"
"[Motorola68k]Assembler\n[x86masm]Assembler\nAwk\n[gnu]Awk\n[POSIX]Awk\n"
"bash\nBasic\n[Visual]Basic\nC\n[ANSI]C\n[Handel]C\n[Objective]C\n"
"[Sharp]C\nC++\n[ANSI]C++\n[GNU]C++\n[ISO]C++\n[Visual]C++\nCaml\n"
"[light]Caml\n[Objective]Caml\nClean\nCobol\n[1974]Cobol\n[1985]Cobol\n"
"[ibm]Cobol\nComal 80\ncommand.com\n[WinXP]command.com\nComsol\ncsh\n"
"Delphi\nEiffel\nElan\nEuphoria\nFortran\n[77]Fortran\n[90]Fortran\n"
"[95]Fortran\nGCL\nGnuplot\nHaskell\nHTML\nIDL\n[CORBA]IDL\ninform\n"
"Java\n[AspectJ]Java\nJVMIS\nksh\nLingo\nLisp\n[Auto]Lisp\nLogo\n"
"make\n[gnu]make\nMathematica\n[1.0]Mathematica\n[3.0]Mathematica\n"
"[5.2]Mathematica\nMatlab\nMercury\nMetaPost\nMiranda\nMizar\nML\n"
"Modula-2\nMuPAD\nNASTRAN\nOberon-2\nOCL\n[decorative]OCL\n[OMG]OCL\n"
"Octave\nOz\nPascal\n[Borland6]Pascal\n[Standard]Pascal\n[XSC]Pascal\n"
"Perl\nPHP\nPL/I\nPlasm\nPostScript\nPOV\nProlog\nPromela\nPSTricks\n"
"Python\nR\nReduce\nRexx\nRSL\nRuby\nS\n[PLUS]S\nSAS\nScilab\nsh\n"
"SHELXL\nSimula\n[67]Simula\n[CII]Simula\n[DEC]Simula\n[IBM]Simula\n"
"SPARQL\nSQL\ntcl\n[tk]tcl\nTeX\n[AlLaTeX]TeX\n[common]TeX\n[LaTeX]TeX\n"
"[plain]TeX\n[primitive]TeX\nVBScript\nVerilog\nVHDL\n[AMS]VHDL\nVRML\n"
"[97]VRML\nXML\nXSLT";
char const * style_hint = "Use \\footnotesize, \\small, \\itshape, \\ttfamily or something like that";
char const * frame_hint = "none, leftline, topline, bottomline, lines, single, shadowbox or subset of trblTRBL";
char const * frameround_hint = "The foru letters (t or f) attached to top right, bottom right, bottom left and top left corner.";
char const * frameround_hint =
"Enter four letters (either t = round or f = square) for top right, bottom right, bottom left and top left corner.";
char const * color_hint = "Enter something like \\color{white}";
/// options copied from page 26 of listings manual
@ -301,50 +319,69 @@ parValidator::parValidator(string const & n)
void parValidator::validate(std::string const & par) const
{
bool unclosed = false;
string par2 = par;
// braces are allowed
if (prefixIs(par, "{") && suffixIs(par, "}"))
par2 = par.substr(1, par.size() - 2);
else if (prefixIs(par, "{")) {
par2 = par.substr(1);
unclosed = true;
}
switch (info->type) {
case ALL:
if (par.empty() && !info->onoff) {
if (par2.empty() && !info->onoff) {
if (info->hint != "")
throw invalidParam(info->hint);
else
throw invalidParam("An value is expected");
throw invalidParam("A value is expected");
}
if (unclosed)
throw invalidParam("Unbalanced braces!");
return;
case TRUEFALSE: {
if (par.empty() && !info->onoff) {
if (par2.empty() && !info->onoff) {
if (info->hint != "")
throw invalidParam(info->hint);
else
throw invalidParam("Please specify true or false");
}
if (par != "true" && par != "false")
if (par2 != "true" && par2 != "false")
throw invalidParam("Only true or false is allowed for parameter" + name);
if (unclosed)
throw invalidParam("Unbalanced braces!");
return;
}
case INTEGER: {
if (!isStrInt(par)) {
if (!isStrInt(par2)) {
if (info->hint != "")
throw invalidParam(info->hint);
else
throw invalidParam("Please specify an integer value");
}
if (convert<int>(par) == 0 && par[0] != '0')
if (convert<int>(par2) == 0 && par2[0] != '0')
throw invalidParam("An integer is expected for parameter " + name);
if (unclosed)
throw invalidParam("Unbalanced braces!");
return;
}
case LENGTH: {
if (par.empty() && !info->onoff) {
if (par2.empty() && !info->onoff) {
if (info->hint != "")
throw invalidParam(info->hint);
else
throw invalidParam("Please specify a latex length expression");
}
if (!isValidLength(par))
if (!isValidLength(par2))
throw invalidParam("Invalid latex length expression for parameter " + name);
if (unclosed)
throw invalidParam("Unbalanced braces!");
return;
}
case ONEOF: {
if (par.empty() && !info->onoff) {
if (par2.empty() && !info->onoff) {
if (info->hint != "")
throw invalidParam(info->hint);
else
@ -364,13 +401,16 @@ void parValidator::validate(std::string const & par) const
lists.push_back(v);
// good, find the string
if (std::find(lists.begin(), lists.end(), par) != lists.end())
if (std::find(lists.begin(), lists.end(), par2) != lists.end()) {
if (unclosed)
throw invalidParam("Unbalanced braces!");
return;
}
// otherwise, produce a meaningful error message.
string matching_names;
for (vector<string>::iterator it = lists.begin();
it != lists.end(); ++it) {
if (it->size() >= par.size() && it->substr(0, par.size()) == par) {
if (it->size() >= par2.size() && it->substr(0, par2.size()) == par2) {
if (matching_names.empty())
matching_names += *it;
else
@ -384,16 +424,18 @@ void parValidator::validate(std::string const & par) const
return;
}
case SUBSETOF: {
if (par.empty() && !info->onoff) {
if (par2.empty() && !info->onoff) {
if (info->hint != "")
throw invalidParam(info->hint);
else
throw invalidParam("Please specify one or more of " + string(info->info));
}
for (size_t i = 0; i < par.size(); ++i)
if (string(info->info).find(par[i], 0) == string::npos)
for (size_t i = 0; i < par2.size(); ++i)
if (string(info->info).find(par2[i], 0) == string::npos)
throw invalidParam("Parameter " + name +
" should be composed of one or more of " + info->info);
if (unclosed)
throw invalidParam("Unbalanced braces!");
return;
}
}