X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvspace.C;h=f62d348c10313cce41177e295d6544f8537fb751;hb=dad1fc66e44a4dad94eb1e9ffd5736bf8f59ae6d;hp=51a360463fbb2f8307ee4b3ef63b4ff2a0437689;hpb=0957efa5403cfa1ddb6b8f113986e8bd7616d4f9;p=lyx.git

diff --git a/src/vspace.C b/src/vspace.C
index 51a360463f..f62d348c10 100644
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -8,23 +8,21 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "vspace.h"
 #include "lengthcommon.h"
-#include "lyx_main.h"
 #include "buffer.h"
 #include "lyxrc.h"
-#include "lyxtext.h"
 #include "BufferView.h"
+#include "lyxtext.h"
 #include "support/LAssert.h"
 
 #include "support/lstrings.h"
 
 #include <cstdio>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::sscanf;
+#endif
 
 namespace {
 
@@ -52,7 +50,7 @@ void lyx_advance(string & data, string::size_type n)
 inline
 bool isEndOfData(string const & data)
 {
-	return frontStrip(data).empty();
+	return ltrim(data).empty();
 }
 
 /**
@@ -60,8 +58,8 @@ bool isEndOfData(string const & data)
  * @param data input string
  * @return a char representing the type of token returned
  *
- * The possible return values are : 
- * 	+	stretch indicator for glue length
+ * The possible return values are :
+ *	+	stretch indicator for glue length
  *	-	shrink indicator for glue length
  *	n	a numeric value (stored in number array)
  *	u	a unit type (stored in unit array)
@@ -69,7 +67,7 @@ bool isEndOfData(string const & data)
  */
 char nextToken(string & data)
 {
-	data = frontStrip(data);
+	data = ltrim(data);
 	if (data.empty())
 		return '\0';
 	else if (data[0] == '+') {
@@ -91,7 +89,7 @@ char nextToken(string & data)
 			if (number_index > 3) return 'E';
 
 			string buffer;
-		
+
 			// we have found some number
 			if (i == string::npos) {
 				buffer = data;
@@ -107,13 +105,13 @@ char nextToken(string & data)
 				return 'n';
 			} else return 'E';
 		}
-		
+
 		i = data.find_first_not_of("abcdefghijklmnopqrstuvwxyz%");
 		if (i != 0) {
 			if (unit_index > 3) return 'E';
 
 			string buffer;
-		
+
 			// we have found some alphabetical string
 			if (i == string::npos) {
 				buffer = data;
@@ -199,7 +197,7 @@ bool isValidGlueLength(string const & data, LyXGlueLength * result)
 
 	if (data.empty())
 		return true;
-	string buffer = frontStrip(data);
+	string buffer = ltrim(data);
 
 	// To make isValidGlueLength recognize negative values as
 	// the first number this little hack is needed:
@@ -217,7 +215,7 @@ bool isValidGlueLength(string const & data, LyXGlueLength * result)
 		break;
 	}
 	// end of hack
-	
+
 	int  pattern_index = 0;
 	int  table_index = 0;
 	char pattern[20];
@@ -241,7 +239,7 @@ bool isValidGlueLength(string const & data, LyXGlueLength * result)
 		if (!*table[table_index].pattern)
 			return false;
 	}
-	
+
 	// Get the values from the appropriate places.  If an index
 	// is zero, the corresponding array value is zero or UNIT_NONE,
 	// so we needn't check this.
@@ -286,7 +284,7 @@ bool isValidLength(string const & data, LyXLength * result)
 		break;
 	}
 	// end of hack
-	
+
 	number_index = unit_index = 1;  // entries at index 0 are sentinels
 
 	// construct "pattern" from "data"
@@ -301,8 +299,8 @@ bool isValidLength(string const & data, LyXLength * result)
 	pattern[pattern_index] = '\0';
 
 	// only the most basic pattern is accepted here
-	if (compare(pattern, "nu") != 0) return false;		
-	
+	if (compare(pattern, "nu") != 0) return false;
+
 	// It _was_ a correct length string.
 	// Store away the values we found.
 	if (result) {
@@ -343,11 +341,11 @@ VSpace::VSpace(string const & data)
 	if (data.empty())
 		return;
 	double value;
-	string input  = strip(data);
+	string input  = rtrim(data);
 
 	string::size_type const length = input.length();
 
-	if (length > 1 && input[length-1] == '*') {
+	if (length > 1 && input[length - 1] == '*') {
 		keep_ = true;
 		input.erase(length - 1);
 	}
@@ -427,55 +425,73 @@ string const VSpace::asLyXCommand() const
 
 string const VSpace::asLatexCommand(BufferParams const & params) const
 {
+	string ret;
+
 	switch (kind_) {
-	case NONE:      return string();
+	case NONE:
+		break;
 	case DEFSKIP:
-		return params.getDefSkip().asLatexCommand(params);
-	case SMALLSKIP: return keep_ ? "\\vspace*{\\smallskipamount}"
-				: "\\smallskip{}";
-	case MEDSKIP:   return keep_ ? "\\vspace*{\\medskipamount}"
-				: "\\medskip{}";
-	case BIGSKIP:   return keep_ ? "\\vspace*{\\bigskipamount}"
-				: "\\bigskip{}";
-	case VFILL:     return keep_ ? "\\vspace*{\\fill}"
-				: "\\vfill{}";
-	case LENGTH:    return keep_ ? "\\vspace*{" + len_.asLatexString() + '}'
-				: "\\vspace{" + len_.asLatexString() + '}';
+		ret = params.getDefSkip().asLatexCommand(params);
+		break;
+	case SMALLSKIP:
+		ret = keep_ ? "\\vspace*{\\smallskipamount}"
+			: "\\smallskip{}";
+		break;
+	case MEDSKIP:
+		ret = keep_ ? "\\vspace*{\\medskipamount}"
+			: "\\medskip{}";
+		break;
+	case BIGSKIP:
+		ret = keep_ ? "\\vspace*{\\bigskipamount}"
+			: "\\bigskip{}";
+		break;
+	case VFILL:
+		ret = keep_ ? "\\vspace*{\\fill}"
+			: "\\vfill{}";
+		break;
+	case LENGTH:
+	{
+		string const lenstr = len_.asLatexString();
+
+		ret = keep_ ? "\\vspace*{" + lenstr + '}'
+			: "\\vspace{" + lenstr + '}';
+	}
+	break;
+
 	}
-	
-	lyx::Assert(0);
-	// of course, we cannot get there, but gcc is too stupid to
-	// see that. *Sigh*
-	return string();
+
+	return ret;
 }
 
 
-int VSpace::inPixels(BufferView * bv) const
+
+int VSpace::inPixels(BufferView const * bv) const
 {
 	// Height of a normal line in pixels (zoom factor considered)
-	int const default_height = bv->text->defaultHeight(); // [pixels]
+	int const default_height = defaultRowHeight(); // [pixels]
 
 	int retval = 0;
-	
+
 	switch (kind_) {
+
 	case NONE:
-		// Value for this is already set
+		// value for this is already set
 		break;
+
 	case DEFSKIP:
 		retval = bv->buffer()->params.getDefSkip().inPixels(bv);
 		break;
-			
-		// This is how the skips are normally defined by
-		// LateX.  But there should be some way to change
-		// this per document.
+
+	// This is how the skips are normally defined by LateX.
+	// But there should be some way to change this per document.
 	case SMALLSKIP:
 		retval = default_height / 4;
 		break;
-			
+
 	case MEDSKIP:
 		retval = default_height / 2;
 		break;
-			
+
 	case BIGSKIP:
 		retval = default_height;
 		break;
@@ -484,13 +500,11 @@ int VSpace::inPixels(BufferView * bv) const
 		// leave space for the vfill symbol
 		retval = 3 * default_height;
 		break;
-		
-	case LENGTH: {
-		int const default_width  = bv->workWidth();
-		retval = len_.len().inPixels(default_width, default_height);
+
+	case LENGTH:
+		retval = len_.len().inPixels(bv->workWidth());
 		break;
-	}
-		
+
 	}
 	return retval;
 }