[LyX/master] Amend 13ee0bc8cd1025

Juergen Spitzmueller spitz at lyx.org
Wed Aug 21 15:55:09 UTC 2024


commit 47176ce34cd39cfdc0a2d094fc5983e30ce0f1d4
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Wed Aug 21 17:54:06 2024 +0200

    Amend 13ee0bc8cd1025
    
    Improve tex2lyx handling
---
 src/tex2lyx/Preamble.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index c21a97abbe..cb57d9115c 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -1786,10 +1786,13 @@ void Preamble::handle_package(Parser &p, string const & name,
 			h_use_nomentbl = true;
 			options.erase(it);
 		}
-		if (!options.empty())
-			// Fixme: add PackageOptions to local layout
-			warning_message("Ignoring options '" + join(options, ",")
-					+ "' of package " + name + '.');
+		// Add the package options to the global document options
+		if (!options.empty()) {
+			if (h_options.empty())
+				h_options = join(options, ",");
+			else
+				h_options += ',' + join(options, ",");
+		}
 	}
 
 	else if (name == "geometry")


More information about the lyx-cvs mailing list