Translate labels for float:algorithm, float:figure and float:table.

[lyx.git] / src / insets / insetgraphicsParams.C

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index b1bfec7975eab4eb4c459123371b5c559aaed37c..9cb6ceb70a67682ceb26404ea37af51f73d39f00 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -39,26 +39,6 @@ bool translatorsSet = false;
 Translator< InsetGraphicsParams::DisplayType, string >
 displayTranslator(InsetGraphicsParams::DEFAULT, "default");
 
-// this is only compatibility stuff for the first 1.2 version
-// it is obselete until 1.3
-LyXLength convertResizeValue(string const token, LyXLex & lex) {
-    lex.next();
-    string value = lex.getString();    // "width" or "height"
-    lex.next();                                // anyway not interesting
-    value = lex.getString();
-    if (token == "default")
-       return (LyXLength(value+"pt"));
-    else if (token == "cm")
-       return (LyXLength(value+"cm"));
-    else if (token == "inch")
-       return (LyXLength(value+"in"));
-    else if (token == "percentOfColumn")
-       return (LyXLength(value+"c%"));
-    else if (token == "percentOfPage")
-       return (LyXLength(value+"p%"));
-    else return LyXLength("0pt");      // nothing with figinset
-}
-
 } // namespace anon
 
 
@@ -218,7 +198,7 @@ void InsetGraphicsParams::Write(ostream & os) const
                os << "\tkeepAspectRatio\n";
        if (rotate)
                os << "\trotate\n";
-       if (!lyx::float_equal(rotateAngle, 0.0, 0.001))
+       if (rotateAngle != 0.0)
                os << "\trotateAngle " << rotateAngle << '\n';
        if (!rotateOrigin.empty())
                os << "\trotateOrigin " << rotateOrigin << '\n';
@@ -251,11 +231,8 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const& token)
                draft = true;
        } else if (token == "display") {
                lex.next();
-               if (IsFileReadable(filename)) {
-                       string const type = lex.getString();
-                       display = displayTranslator.find(type);
-               } else
-                       display = NONE;
+               string const type = lex.getString();
+               display = displayTranslator.find(type);
        } else if (token == "subcaption") {
                subcaption = true;
        } else if (token == "subcaptionText") {
@@ -311,26 +288,9 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const& token)
        } else if (token == "lyxscale") {
                lex.next();
                lyxscale = lex.getInteger();
-       // now the compytibility stuff for "old" 1.2.0 files which uses
-       // the first try of the new graphic inset. Can be deleted, when
-       // 1.3 comes out
-       } else if (token == "widthResize") {
-               if (lex.next()) {
-                   string const token = lex.getString();
-                   if (token == "scale") {
-                       lex.next();
-                       scale = lex.getInteger();
-                       size_type = SCALE;
-                   }
-                   else {
-                       width = convertResizeValue(token, lex);
-                       size_type = WH;
-                   }
-               }
-       } else if (token == "heightResize") {
-               if (lex.next())
-                       height = convertResizeValue(lex.getString(), lex);
-       // end compytibility stuff
+       } else if (token == "special") {
+               lex.eatLine();
+               special = lex.getString();
        } else {        // If it's none of the above, its not ours.
                return false;
        }