* src/insets/InsetExternal.cpp (validate):

- bug fix: if no specific PDFLaTeX out format is defined, we have to use
	  the LaTeX requirement tag in pdflatex output

* lib/external_templates:
	- remove unneeded PDFLaTeX format specification.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24255 a592a061-630c-0410-9148-cb99ea01b6c8

lib/external_templates

@@ -250,7 +250,7 @@ Template PDFPages
 		Includes PDF documents, using the 'pdfpages' package.
 		
 		To include multiple pages, use the "pages"-option,
-		which must be inserted to "Options" (Format "PDFLaTeX").
+		which must be inserted to "Options".
 		Examples:
 		    * pages={x-y} (for a range of pages)
 		    * pages={x,y,z} (for specific pages)
@@ -275,17 +275,6 @@ Template PDFPages
 		Requirement "pdfpages"
 		ReferencedFile pdflatex "$$AbsPath$$Basename.pdf"
 	FormatEnd
-	Format PDFLaTeX
-		TransformOption Rotate RotationLatexOption
-		TransformOption Resize ResizeLatexOption
-		TransformOption Extra  ExtraOption
-		Option Arg "[$$Extra,$$Rotate,$$Resize]"
-		Product "\\includepdf$$Arg{$$AbsOrRelPathMaster$$Basename}"
-		UpdateFormat pdf
-		UpdateResult "$$AbsPath$$Basename.pdf"
-		Requirement "pdfpages"
-		ReferencedFile pdflatex "$$AbsPath$$Basename.pdf"
-	FormatEnd
 	Format Ascii
 		Product "[PDFPages: $$FName]"
 	FormatEnd

src/insets/InsetExternal.cpp

@@ -838,8 +838,17 @@ void InsetExternal::validate(LaTeXFeatures & features) const
 	}
 	external::Template::Formats::const_iterator cit =
 		et.formats.find(format);
+
+	if (cit == et.formats.end()) {
+		// If the template has not specified a PDFLaTeX output,
+		// we try the LaTeX format.
+		if (format == "PDFLaTeX") {
+			cit = et.formats.find("LaTeX");
 			if (cit == et.formats.end())
 				return;
+		} else
+			return;
+	}
 
 	// FIXME: We don't need that always
 	features.require("lyxdot");