X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvspace.C;h=5966cb66af53b48fbedd7295f72ef55ea65b6812;hb=29f01faa17495e3d80c08f234c8f049c7d699ac1;hp=ae5cc6438df2672052a6a2a531bb9367ac072fac;hpb=d8037e4bfdd8524ccbf3a1fccfc9d5264644b99e;p=lyx.git diff --git a/src/vspace.C b/src/vspace.C index ae5cc6438d..5966cb66af 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 @@ -16,45 +14,63 @@ #include "vspace.h" #include "lengthcommon.h" -#include "lyx_main.h" #include "buffer.h" #include "lyxrc.h" -#include "lyxtext.h" #include "BufferView.h" +#include "support/LAssert.h" #include "support/lstrings.h" #include +#ifndef CXX_GLOBAL_CSTD +using std::sscanf; +#endif 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(); + return ltrim(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); + data = ltrim(data); if (data.empty()) return '\0'; else if (data[0] == '+') { @@ -76,7 +92,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 +108,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 +141,7 @@ char nextToken(string & data) } +/// latex representation of a vspace struct LaTeXLength { char const * pattern; int plus_val_index; @@ -134,6 +151,7 @@ struct LaTeXLength { }; +/// the possible formats for a vspace string LaTeXLength table[] = { { "nu", 0, 0, 0, 0 }, { "nu+nu", 2, 0, 2, 0 }, @@ -182,7 +200,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: @@ -200,7 +218,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 +242,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 +260,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 +287,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 +302,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) { @@ -326,11 +344,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); } @@ -410,65 +428,86 @@ 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; + } -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_skip = 0; - int default_width = bv->workWidth(); + return ret; +} - if (kind_ == DEFSKIP) - default_skip = bv->buffer()->params.getDefSkip().inPixels(bv); - // Height of a normal line in pixels (zoom factor considered) - int height = default_height; // [pixels] - - // Zoom factor specified by user in percent - double const zoom = lyxrc.zoom / 100.0; // [percent] - // DPI setting for monitor: pixels/inch - double const dpi = lyxrc.dpi; // screen resolution [pixels/inch] +int VSpace::inPixels(BufferView const * bv) const +{ + // Height of a normal line in pixels (zoom factor considered) + int const default_height = bv->defaultHeight(); // [pixels] - // We want the result in pixels - double result; - double value; + int retval = 0; switch (kind_) { + case NONE: - return 0; + // value for this is already set + break; case DEFSKIP: - return default_skip; - - // This is how the skips are normally defined by - // LateX. But there should be some way to change - // this per document. - case SMALLSKIP: return height / 4; - case MEDSKIP: return height / 2; - case BIGSKIP: return height; - case VFILL: return 3 * height; + 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: + retval = default_height / 4; + break; + + case MEDSKIP: + retval = default_height / 2; + break; + + case BIGSKIP: + retval = default_height; + break; + + case VFILL: // leave space for the vfill symbol + retval = 3 * default_height; + break; + case LENGTH: - return len_.len().inPixels(bv); + retval = len_.len().inPixels(bv->workWidth(), default_height); + break; + } - return 0; // never reached + return retval; }