* InsetCollapsable:

[lyx.git] / src / insets / InsetListingsParams.cpp

diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp
index 9c084e0353eecbb7d065d840245893a1ac361c4f..1e7c9b69917f5a42cdef5b212b682822ffa8ad35 100644 (file)
--- a/src/insets/InsetListingsParams.cpp
+++ b/src/insets/InsetListingsParams.cpp
@@ -30,8 +30,7 @@ using std::ostream;
 using std::string;
 using std::exception;
 
-namespace lyx
-{
+namespace lyx {
 
 using support::bformat;
 using support::trim;
@@ -246,7 +245,7 @@ char const * allowed_languages =
        "[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"
+       "Delphi\nEiffel\nElan\nerlang\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"
@@ -579,6 +578,47 @@ ParValidator::ParValidator()
                ListingsParam("", false, ALL, "", empty_hint);
        all_params_["podcomment"] =
                ListingsParam("", false, ALL, "", empty_hint);
+       // the following are experimental listings features
+       all_params_["procnamekeys"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["moreprocnamekeys"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["deleteprocnamekeys"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["procnamestyle"] =
+               ListingsParam("", false, ALL, "", style_hint);
+       all_params_["indexprocnames"] =
+               ListingsParam("", false, TRUEFALSE, "", empty_hint);
+       all_params_["hyperref"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["morehyperref"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["deletehyperref"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["hyperanchor"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["hyperlink"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["literate"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["lgrindef"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["rangebeginprefix"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["rangebeginsuffix"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["rangeendprefix"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["rangeendsuffix"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["rangeprefix"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["rangesuffix"] =
+               ListingsParam("", false, ALL, "", empty_hint);
+       all_params_["includerangemarker"] =
+               ListingsParam("", false, TRUEFALSE, "", empty_hint);
+       all_params_["multicols"] =
+               ListingsParam("", false, INTEGER, "", empty_hint);
 }
 
 
@@ -719,7 +759,7 @@ void InsetListingsParams::addParam(string const & key, string const & value)
        if (params_.find(key) != params_.end())
                // key=value,key=value1 is allowed in listings
                // use key_, key__, key___ etc to avoid name conflict
-               while (params_.find(keyname += '_') != params_.end());
+               while (params_.find(keyname += '_') != params_.end()) { }
        // check onoff flag
        // onoff parameter with value false
        if (!par_validator)