Account for old versions of Pygments

[lyx.git] / src / VSpace.cpp

diff --git a/src/VSpace.cpp b/src/VSpace.cpp
index 944d016ce33279ffe446768b10c7585e224bd711..6e065964039e7ca6e1d3f02da613f81e795b0230 100644 (file)
--- a/src/VSpace.cpp
+++ b/src/VSpace.cpp
@@ -147,9 +147,10 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
                        : "\\vspace{" + len_.asLatexString() + '}';
 
        default:
-               LASSERT(false, /**/);
-               return string();
+               LATTEST(false);
+               // fall through in release mode
        }
+       return string();
 }
 
 
@@ -211,13 +212,13 @@ int VSpace::inPixels(BufferView const & bv) const
        case DEFSKIP:
                return bv.buffer().params().getDefSkip().inPixels(bv);
 
-       // This is how the skips are normally defined by LateX.
+       // This is how the skips are normally defined by LaTeX.
        // But there should be some way to change this per document.
        case SMALLSKIP:
-               return default_height / 4;
+               return int(default_height / 4);
 
        case MEDSKIP:
-               return default_height / 2;
+               return int(default_height / 2);
 
        case BIGSKIP:
                return default_height;
@@ -227,12 +228,13 @@ int VSpace::inPixels(BufferView const & bv) const
                return 3 * default_height;
 
        case LENGTH:
-               return len_.len().inPixels(bv.workWidth());
+               return bv.inPixels(len_.len());
 
        default:
-               LASSERT(false, /**/);
-               return 0;
+               LATTEST(false);
+               // fall through in release mode
        }
+       return 0;
 }