From: Richard Heck <rgheck@lyx.org>
Date: Sun, 31 Jul 2016 01:57:52 +0000 (-0400)
Subject: Use scaling factor in XHTML output.
X-Git-Tag: 2.3.0alpha1~1196
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=47c52db13e2f58224d31a2e26a69320f1f5b16cf;p=features.git

Use scaling factor in XHTML output.
---

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 4619c610a3..4d850b59db 100644
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -962,10 +962,20 @@ docstring InsetGraphics::xhtml(XHTMLStream & xs, OutputParams const & op) const
 	// really be better to do width and height conversion, rather than to output
 	// these parameters here.
 	string imgstyle;
-	if (!params().width.zero())
-		imgstyle += "width:" + params().width.asHTMLString() + ";";
-	if (!params().height.zero())
-		imgstyle += " height:" + params().height.asHTMLString() + ";";
+	bool const havewidth  = !params().width.zero();
+	bool const haveheight = !params().height.zero();
+	if (havewidth || haveheight) {
+		if (havewidth)
+			imgstyle += "width:" + params().width.asHTMLString() + ";";
+		if (haveheight)
+			imgstyle += " height:" + params().height.asHTMLString() + ";";
+	} else if (params().scale != "100") {
+		// Note that this will not have the same effect as in LaTeX export:
+		// There, the image will be scaled from its original size. Here, the
+		// percentage will be interpreted by the browser, and the image will
+		// be scaled to a percentage of the window size.
+		imgstyle = "width:" + params().scale + "%;";
+	}
 	if (!imgstyle.empty())
 		imgstyle = "style='" + imgstyle + "' ";