tex2lyx: Fixes to the btUnit import

1. Do not attempt to mix diverging btUnits (e.g., chapters and sections).
2. use parse_text to properly parse the contents.

(cherry picked from commit 68d48b0015)

src/tex2lyx/Preamble.h

@@ -82,6 +82,8 @@ public:
 	///
 	void citeEngine(std::string const & e) { h_cite_engine = e; }
 	///
+	std::string multibib() const { return h_multibib; }
+	///
 	void multibib(std::string const & s) { h_multibib = s; }
 	///
 	bool titleLayoutFound() const { return title_layout_found; }

src/tex2lyx/text.cpp

@@ -1944,9 +1944,12 @@ void parse_environment(Parser & p, ostream & os, bool outer,
 
 	else if (name == "btUnit") {
 		string const nt = p.next_next_token().cs();
-		if (nt == "part" || nt == "chapter"
-		   || nt == "section" || nt == "subsection") {
-			active_environments.push_back("btUnit");
+		// Do not attempt to overwrite a former diverging multibib.
+		// Those are output as ERT instead.
+		if ((nt == "part" || nt == "chapter"
+		     || nt == "section" || nt == "subsection")
+		   && (preamble.multibib().empty() || preamble.multibib() == nt)) {
+			parse_text(p, os, FLAG_END, outer, parent_context);
 			preamble.multibib(nt);
 		} else
 			parse_unknown_environment(p, name, os, FLAG_END, outer,

status.23x

@@ -39,6 +39,8 @@ What's new
 
 - Add support for horizontal longtabular alignment.
 
+- Add support for btUnit (multibib).
+
 
 
 * USER INTERFACE