]> git.lyx.org Git - lyx.git/blobdiff - src/vspace.C
Fix paragraph spacing
[lyx.git] / src / vspace.C
index e065ab83ce0a77c5fabb12012149d2f6f318ed1a..a314e312543f6d74e3cf4a839ec072eecf27a33b 100644 (file)
@@ -1,11 +1,10 @@
-// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  * 
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -15,6 +14,8 @@
 #pragma implementation "vspace.h"
 #endif
 
+#include <stdio.h>
+
 #include "lyx_main.h"
 #include "buffer.h"
 #include "vspace.h"
 #include "support/lstrings.h"
 
 
+namespace {
+
 /*  length units
  */
 
-static const int num_units = LyXLength::UNIT_NONE;
+int const num_units = LyXLength::UNIT_NONE;
 
 // I am not sure if "mu" should be possible to select (Lgb)
-static char const * unit_name[num_units] = { "sp", "pt", "bp", "dd",
-                                            "mm", "pc", "cc", "cm",
-                                            "in", "ex", "em", "mu" }; 
+char const * unit_name[num_units] = { "sp", "pt", "bp", "dd",
+                                     "mm", "pc", "cc", "cm",
+                                     "in", "ex", "em", "mu",
+                                     "%",  "c%", "p%", "l%" }; 
 
 
-LyXLength::UNIT unitFromString (string const & data)
-{
-       int i = 0;
-       while ((i < num_units) && (data != unit_name[i])) ++i;
-       return static_cast<LyXLength::UNIT>(i);
-}
-
 /*  The following static items form a simple scanner for
  *  length strings, used by isValid[Glue]Length.  See comments there.
  */
-static float           number[4] = { 0, 0, 0, 0 };
-static LyXLength::UNIT unit[4]   = { LyXLength::UNIT_NONE,
-                                    LyXLength::UNIT_NONE,
-                                    LyXLength::UNIT_NONE,
-                                    LyXLength::UNIT_NONE };
-//static int number_index, unit_index;
-int number_index, unit_index;
+float           number[4] = { 0, 0, 0, 0 };
+LyXLength::UNIT unit[4]   = { LyXLength::UNIT_NONE,
+                             LyXLength::UNIT_NONE,
+                             LyXLength::UNIT_NONE,
+                             LyXLength::UNIT_NONE };
+int number_index;
+int unit_index;
 
 
-static inline
+inline
 void lyx_advance(string & data, unsigned int n)
 {
        data.erase(0, n);
 }
 
 
-static inline
+inline
 bool isEndOfData(string const & data)
 {
        return frontStrip(data).empty();
 }
 
 
-static
 char nextToken(string & data)
 {
        data = frontStrip(data);
@@ -87,32 +83,57 @@ char nextToken(string & data)
                lyx_advance(data, 5);
                return '-';
        } else {
-               string::size_type i;
+               string::size_type i = data.find_first_not_of("0123456789.");
+
+               if (i != 0) {
+                       if (number_index > 3) return 'E';
+
+                       string buffer;
+               
+                       // we have found some number
+                       if (i == string::npos) {
+                               buffer = data;
+                               i = data.size() + 1;
+                       } else
+                               buffer = data.substr(0, i);
+
+                       lyx_advance(data, i);
 
-               // I really mean assignment ("=") below, not equality!
-               if ((i = data.find_last_of("0123456789.")) != string::npos) {
-                       if (number_index > 3) return 'E';  // Error
-                        string buffer = data.substr(0, i + 1);
                        if (isStrDbl(buffer)) {
                                number[number_index] = strToDbl(buffer);
-                               lyx_advance(data, i + 1);
                                ++number_index;
                                return 'n';
-                       } else 
-                               return 'E';  // Error
-               } else if ((i = data.find_last_of("abcdefghijklmnopqrstuvwxyz"))
-                          != string::npos) {
-                       if (unit_index > 3) return 'E';  // Error
-                       string buffer = data.substr(0, i + 1);
-                       unit[unit_index] = unitFromString(buffer);
+                       } 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;
+                               i = data.size() + 1;
+                       } else
+                               buffer = data.substr(0, i);
+
+                       // possibly we have "mmplus" string or similar
+                       if (buffer.size() > 5 && (buffer.substr(2,4) == string("plus") || buffer.substr(2,5) == string("minus"))) {
+                               lyx_advance(data, 2);
+                               unit[unit_index] = unitFromString(buffer.substr(0, 2));
+                       } else {
+                               lyx_advance(data, i);
+                               unit[unit_index] = unitFromString(buffer);
+                       }
+
                        if (unit[unit_index] != LyXLength::UNIT_NONE) {
-                               lyx_advance(data, i + 1);
                                ++unit_index;
                                return 'u';
-                       } else
-                               return 'E';  // Error
-               } else
-                       return 'E';  // Error
+                       } else return 'E';  // Error
+               }
+               return 'E';  // Error
        }
 }
 
@@ -124,7 +145,6 @@ struct LaTeXLength {
 };
 
 
-static
 LaTeXLength table[] = {
        { "nu",       0, 0, 0, 0 },
        { "nu+nu",    2, 0, 2, 0 },
@@ -142,6 +162,23 @@ LaTeXLength table[] = {
        { "",         0, 0, 0, 0 }   // sentinel, must be empty
 };
 
+} // namespace anon
+
+const char * stringFromUnit(int unit)
+{
+    if (unit < 0 || unit >= num_units)
+       return 0;
+    return unit_name[unit];
+}
+
+
+LyXLength::UNIT unitFromString (string const & data)
+{
+       int i = 0;
+       while ((i < num_units) && (data != unit_name[i])) ++i;
+       return static_cast<LyXLength::UNIT>(i);
+}
+
 
 bool isValidGlueLength (string const & data, LyXGlueLength * result)
 {
@@ -168,7 +205,7 @@ bool isValidGlueLength (string const & data, LyXGlueLength * result)
        // To make isValidGlueLength recognize negative values as
        // the first number this little hack is needed:
        short val_sign = 1; // positive as default
-       switch(buffer[0]) {
+       switch (buffer[0]) {
        case '-':
                lyx_advance(buffer, 1);
                val_sign = -1;
@@ -224,6 +261,8 @@ bool isValidLength(string const & data, LyXLength * result)
        /// The parser may seem overkill for lengths without 
        /// glue, but since we already have it, using it is
        /// easier than writing something from scratch.
+       if (data.empty())
+               return true;
 
         string   buffer(data);
        int       pattern_index = 0;
@@ -232,7 +271,7 @@ bool isValidLength(string const & data, LyXLength * result)
        // To make isValidLength recognize negative values
        // this little hack is needed:
        short val_sign = 1; // positive as default
-       switch(buffer[0]) {
+       switch (buffer[0]) {
        case '-':
                lyx_advance(buffer, 1);
                val_sign = -1;
@@ -287,12 +326,34 @@ LyXLength::LyXLength(string const & data)
 
 string const LyXLength::asString() const
 {
-       std::ostringstream buffer;
+       ostringstream buffer;
        buffer << val << unit_name[uni]; // setw?
        return buffer.str().c_str();
 }
 
 
+string const LyXLength::asLatexString() const
+{
+       ostringstream buffer;
+       switch(uni) {
+       case PW:
+       case PE:
+           buffer << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\columnwidth";
+           break;
+       case PP:
+           buffer << "." << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\pagewidth";
+           break;
+       case PL:
+           buffer << "." << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\linewidth";
+           break;
+       default:
+           buffer << val << unit_name[uni]; // setw?
+           break;
+       }
+       return buffer.str().c_str();
+}
+
+
 /*  LyXGlueLength class
  */
 
@@ -315,7 +376,7 @@ LyXGlueLength::LyXGlueLength (string const & data)
 
 string const LyXGlueLength::asString() const
 {
-       std::ostringstream buffer;
+       ostringstream buffer;
 
        if (plus_val != 0.0)
                if (minus_val != 0.0)
@@ -369,7 +430,7 @@ string const LyXGlueLength::asString() const
 
 string const LyXGlueLength::asLatexString() const
 {
-       std::ostringstream buffer;
+       ostringstream buffer;
 
        if (plus_val != 0.0)
                if (minus_val != 0.0)
@@ -432,16 +493,16 @@ VSpace::VSpace (string const & data)
 
 bool VSpace::operator==(VSpace const & other) const
 {
-       if (this->kin == other.kin) 
-               if (this->kin == LENGTH)
-                       if (this->len == other.len)
-                               return this->kp == other.kp;
-                       else
-                               return false;
-               else
-                       return this->kp == other.kp;
-       else
+       if (this->kin != other.kin)
                return false;
+       if (this->kin != LENGTH)
+               return this->kp == other.kp;
+       if (!(this->len == other.len))
+               return false;
+       return this->kp == other.kp;
 }
 
 
@@ -489,15 +550,17 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
 int VSpace::inPixels(BufferView * bv) const
 {
        // Height of a normal line in pixels (zoom factor considered)
-       int height = bv->text->DefaultHeight(); // [pixels]
+       int height = bv->text->defaultHeight(); // [pixels]
        int skip = 0;
+       int width = bv->workWidth();
+
        if (kin == DEFSKIP)
            skip = bv->buffer()->params.getDefSkip().inPixels(bv);
 
-       return inPixels(height, skip);
+       return inPixels(height, skip, width);
 }
 
-int VSpace::inPixels(int default_height, int default_skip) const
+int VSpace::inPixels(int default_height, int default_skip, int default_width) const
 {
        // Height of a normal line in pixels (zoom factor considered)
        int height = default_height; // [pixels]
@@ -593,6 +656,12 @@ int VSpace::inPixels(int default_height, int default_skip) const
                        // math mode
                        result = zoom * value * height;
                        break;
+               case LyXLength::PW: // Always % of workarea
+               case LyXLength::PE:
+               case LyXLength::PP:
+               case LyXLength::PL:
+                       result = value * default_width / 100;
+                       break;
                case LyXLength::UNIT_NONE:
                        result = 0;  // this cannot happen
                        break;