X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvspace.C;h=6b4d25a7ed5a16e73484828a3ec1d4267c60a0ac;hb=98c966c64594611e469313314abd1e59524adb4a;hp=6c1e46f34a6731f3971e0d2e7b91fb3fd50d416b;hpb=f0a372d294a035f229e14ebd9c9b7394deda0075;p=lyx.git diff --git a/src/vspace.C b/src/vspace.C index 6c1e46f34a..6b4d25a7ed 100644 --- a/src/vspace.C +++ b/src/vspace.C @@ -1,12 +1,10 @@ -/* This file is part of - * ====================================================== +/** + * \file vspace.C + * Copyright 1995-2002 the LyX Team + * Read the file COPYING * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ + * \author Matthias Ettrich + */ #include @@ -21,6 +19,7 @@ #include "lyxrc.h" #include "lyxtext.h" #include "BufferView.h" +#include "support/LAssert.h" #include "support/lstrings.h" @@ -29,29 +28,45 @@ namespace { -double number[4] = { 0, 0, 0, 0 }; -LyXLength::UNIT unit[4] = { LyXLength::UNIT_NONE, - LyXLength::UNIT_NONE, - LyXLength::UNIT_NONE, - LyXLength::UNIT_NONE }; +/// used to return numeric values in parsing vspace +double number[4] = { 0, 0, 0, 0 }; +/// used to return unit types in parsing vspace +LyXLength::UNIT unit[4] = { LyXLength::UNIT_NONE, + LyXLength::UNIT_NONE, + LyXLength::UNIT_NONE, + LyXLength::UNIT_NONE }; +/// the current position in the number array int number_index; +/// the current position in the unit array int unit_index; +/// skip n characters of input inline void lyx_advance(string & data, string::size_type n) { data.erase(0, n); } - +/// return true when the input is at the end inline bool isEndOfData(string const & data) { return frontStrip(data).empty(); } - +/** + * nextToken - return the next token in the input + * @param data input string + * @return a char representing the type of token returned + * + * 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) + * E parse error + */ char nextToken(string & data) { data = frontStrip(data); @@ -76,7 +91,7 @@ char nextToken(string & data) if (number_index > 3) return 'E'; string buffer; - + // we have found some number if (i == string::npos) { buffer = data; @@ -92,13 +107,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; @@ -125,6 +140,7 @@ char nextToken(string & data) } +/// latex representation of a vspace struct LaTeXLength { char const * pattern; int plus_val_index; @@ -134,6 +150,7 @@ struct LaTeXLength { }; +/// the possible formats for a vspace string LaTeXLength table[] = { { "nu", 0, 0, 0, 0 }, { "nu+nu", 2, 0, 2, 0 }, @@ -200,7 +217,7 @@ bool isValidGlueLength(string const & data, LyXGlueLength * result) break; } // end of hack - + int pattern_index = 0; int table_index = 0; char pattern[20]; @@ -224,7 +241,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. @@ -242,10 +259,10 @@ bool isValidGlueLength(string const & data, LyXGlueLength * result) bool isValidLength(string const & data, LyXLength * result) { - /// This is a trimmed down version of isValidGlueLength. - /// The parser may seem overkill for lengths without - /// glue, but since we already have it, using it is - /// easier than writing something from scratch. + // This is a trimmed down version of isValidGlueLength. + // 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; @@ -269,7 +286,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" @@ -284,8 +301,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) { @@ -410,51 +427,87 @@ 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 + '}'; } - return string(); // should never be reached + break; + + } + + return ret; } + int VSpace::inPixels(BufferView * bv) const { // Height of a normal line in pixels (zoom factor considered) - int default_height = bv->text->defaultHeight(); // [pixels] - int default_width = bv->workWidth(); + int const default_height = bv->text->defaultHeight(); // [pixels] + + int retval = 0; switch (kind_) { case NONE: - return 0; + // Value for this is already set + break; case DEFSKIP: - return bv->buffer()->params.getDefSkip().inPixels(bv); + 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. case SMALLSKIP: - return default_height / 4; + retval = default_height / 4; + break; + case MEDSKIP: - return default_height / 2; + retval = default_height / 2; + break; + case BIGSKIP: - return default_height; + retval = default_height; + break; case VFILL: // leave space for the vfill symbol - return 3 * default_height; - case LENGTH: - return len_.len().inPixels(default_width, default_height); + retval = 3 * default_height; + break; + + case LENGTH: { + int const default_width = bv->workWidth(); + retval = len_.len().inPixels(default_width, default_height); + break; + } + } + return retval; }