backport r31489: Fix support for optional argument of \bibitem in tex2lyx (bug 6249)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31490 a592a061-630c-0410-9148-cb99ea01b6c8

src/tex2lyx/text.cpp

@@ -1445,8 +1445,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			context.check_layout(os);
 			begin_inset(os, "LatexCommand ");
 			os << t.cs() << "\n";
-			os << p.getOpt();
-			os << "key " << '"' << p.verbatim_item() << '"' << "\n";
+			os << "label \"" << p.getOptContent() << "\"\n";
+			os << "key \"" << p.verbatim_item() << "\"\n";
 			end_inset(os);
 		}
 

status.16x

@@ -82,10 +82,12 @@ What's new
   This is a last resort to try to avoid data loss.
 
 - Fix a tex2lyx crash when importing a LaTeX file using an unknown encoding
-  (bug 6142)
+  (bug 6142).
 
-- add encoding "ansinew" as a synonym of "cp1252" for the benefit of 
-  tex2lyx (bug 6142)
+- Add encoding "ansinew" as a synonym of "cp1252" for the benefit of 
+  tex2lyx (bug 6142).
+
+- Fix support for optional argument of \bibitem in tex2lyx (bug 6249).
 
 - Fix support for polytonic Greek with multiple diacritics (bug 5976).
 
@@ -101,11 +103,11 @@ What's new
 - Properly reset the stream encoding after an environment in order to
   match the required file encoding when exporting to LaTeX (bug 6216).
 
-- Fixed layout file for the document class svjour3 (bug6198).
+- Fixed layout file for the document class svjour3 (bug 6198).
 
 - Added the separator style to the layout file for the document class
   elsarticle and adapted the elsarticle.lyx template file accordingly
-  (bug6189).
+  (bug 6189).
 
 
 * USER INTERFACE