]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph.C
* output_plaintext.C: cosmetics in comment: line length cannot be < 0
[lyx.git] / src / paragraph.C
index ace4f0a4d4a8bd84bccfc9a561602525f6be0bbf..00dbb27ff906e99d36828bcd407957e6cda02cb0 100644 (file)
@@ -31,6 +31,7 @@
 #include "lyxfont.h"
 #include "lyxrc.h"
 #include "lyxrow.h"
+#include "messages.h"
 #include "outputparams.h"
 #include "paragraph_funcs.h"
 #include "ParagraphList_fwd.h"
@@ -560,19 +561,22 @@ void Paragraph::makeSameLayout(Paragraph const & par)
 }
 
 
-int Paragraph::stripLeadingSpaces()
+int Paragraph::stripLeadingSpaces(bool trackChanges)
 {
        if (isFreeSpacing())
                return 0;
 
-       int i = 0;
-       while (!empty() && (isNewline(0) || isLineSeparator(0))
-               && !isDeleted(0)) {
-               eraseChar(0, false); // no change tracking here
-               ++i;
+       int pos = 0;
+       int count = 0;
+
+       while (pos < size() && (isNewline(pos) || isLineSeparator(pos))) {
+               if (eraseChar(pos, trackChanges))
+                       ++count;
+               else
+                       ++pos;
        }
 
-       return i;
+       return count;
 }
 
 
@@ -628,6 +632,49 @@ void Paragraph::setLabelWidthString(docstring const & s)
 }
 
 
+docstring const Paragraph::translateIfPossible(docstring const & s,
+               BufferParams const & bparams) const
+{
+       if (!support::isAscii(s) || s.empty()) {
+               // This must be a user defined layout. We cannot translate
+               // this, since gettext accepts only ascii keys.
+               return s;
+       }
+       // Probably standard layout, try to translate
+       Messages & m = getMessages(getParLanguage(bparams)->code());
+       return m.get(to_ascii(s));
+}
+
+
+docstring Paragraph::expandLabel(LyXLayout_ptr const & layout,
+               BufferParams const & bparams, bool process_appendix) const
+{
+       LyXTextClass const & tclass = bparams.getLyXTextClass();
+
+       docstring fmt;
+       if (process_appendix && params().appendix())
+               fmt = translateIfPossible(layout->labelstring_appendix(),
+                       bparams);
+       else
+               fmt = translateIfPossible(layout->labelstring(), bparams);
+
+       // handle 'inherited level parts' in 'fmt',
+       // i.e. the stuff between '@' in   '@Section@.\arabic{subsection}'
+       size_t const i = fmt.find('@', 0);
+       if (i != docstring::npos) {
+               size_t const j = fmt.find('@', i + 1);
+               if (j != docstring::npos) {
+                       docstring parent(fmt, i + 1, j - i - 1);
+                       // FIXME UNICODE
+                       docstring label = expandLabel(tclass[to_utf8(parent)], bparams);
+                       fmt = docstring(fmt, 0, i) + label + docstring(fmt, j + 1, docstring::npos);
+               }
+       }
+
+       return tclass.counters().counterLabel(fmt);
+}
+
+
 void Paragraph::applyLayout(LyXLayout_ptr const & new_layout)
 {
        layout(new_layout);
@@ -761,7 +808,7 @@ int adjust_column_count(string const & str, int oldcol)
 
 // This could go to ParagraphParameters if we want to
 int Paragraph::startTeXParParams(BufferParams const & bparams,
-                                odocstream & os, bool moving_arg) const
+                                 odocstream & os, bool moving_arg) const
 {
        int column = 0;
 
@@ -825,7 +872,7 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
 
 // This could go to ParagraphParameters if we want to
 int Paragraph::endTeXParParams(BufferParams const & bparams,
-                              odocstream & os, bool moving_arg) const
+                               odocstream & os, bool moving_arg) const
 {
        int column = 0;
 
@@ -898,7 +945,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
        // well we have to check if we are in an inset with unlimited
        // length (all in one row) if that is true then we don't allow
        // any special options in the paragraph and also we don't allow
-       // any environment other then "Standard" to be valid!
+       // any environment other than the default layout of the text class
+       // to be valid!
        bool asdefault = forceDefaultParagraphs();
 
        if (asdefault) {
@@ -907,6 +955,13 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
                style = layout();
        }
 
+       // Current base font for all inherited font changes, without any
+       // change caused by an individual character, except for the language:
+       // It is set to the language of the first character.
+       // As long as we are in the label, this font is the base font of the
+       // label. Before the first body character it is set to the base font
+       // of the body.
+       // This must be identical to basefont in TeXOnePar().
        LyXFont basefont;
 
        LaTeXFeatures features(buf, bparams, runparams);
@@ -958,7 +1013,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
                if (i == body_pos) {
                        if (body_pos > 0) {
                                if (open_font) {
-                                       column += running_font.latexWriteEndChanges(os, basefont, basefont);
+                                       column += running_font.latexWriteEndChanges(
+                                               os, basefont, basefont, bparams);
                                        open_font = false;
                                }
                                basefont = getLayoutFont(bparams, outerfont);
@@ -998,9 +1054,10 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
                    (font != running_font ||
                     font.language() != running_font.language()))
                {
-                       column += running_font.latexWriteEndChanges(os,
-                                                                   basefont,
-                                                                   (i == body_pos-1) ? basefont : font);
+                       column += running_font.latexWriteEndChanges(
+                                       os, basefont,
+                                       (i == body_pos-1) ? basefont : font,
+                                       bparams);
                        running_font = basefont;
                        open_font = false;
                }
@@ -1019,8 +1076,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
                     font.language() != running_font.language()) &&
                        i != body_pos - 1)
                {
-                       column += font.latexWriteStartChanges(os, basefont,
-                                                             last_font);
+                       column += font.latexWriteStartChanges(
+                                       os, basefont, last_font, bparams);
                        running_font = font;
                        open_font = true;
                }
@@ -1056,11 +1113,11 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
                if (next_) {
                        running_font
                                .latexWriteEndChanges(os, basefont,
-                                                     next_->getFont(bparams,
-                                                     0, outerfont));
+                                       next_->getFont(bparams, 0, outerfont),
+                                       bparams);
                } else {
                        running_font.latexWriteEndChanges(os, basefont,
-                                                         basefont);
+                                                         basefont, bparams);
                }
 #else
 #ifdef WITH_WARNINGS
@@ -1068,7 +1125,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
 //#warning there as we start another \selectlanguage with the next paragraph if
 //#warning we are in need of this. This should be fixed sometime (Jug)
 #endif
-               running_font.latexWriteEndChanges(os, basefont,  basefont);
+               running_font.latexWriteEndChanges(os, basefont, basefont,
+                                                 bparams);
 #endif
        }
 
@@ -1089,18 +1147,6 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
 
 namespace {
 
-// checks, if newcol chars should be put into this line
-// writes newline, if necessary.
-void sgmlLineBreak(ostream & os, string::size_type & colcount,
-                         string::size_type newcol)
-{
-       colcount += newcol;
-       if (colcount > lyxrc.ascii_linelen) {
-               os << "\n";
-               colcount = newcol; // assume write after this call
-       }
-}
-
 enum PAR_TAG {
        PAR_NONE=0,
        TT = 1,
@@ -1354,38 +1400,7 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams) const
 // Used for building the table of contents
 docstring const Paragraph::asString(Buffer const & buffer, bool label) const
 {
-       OutputParams runparams;
-       return asString(buffer, runparams, label);
-}
-
-
-docstring const Paragraph::asString(Buffer const & buffer,
-                                OutputParams const & runparams,
-                                bool label) const
-{
-#if 0
-       string s;
-       if (label && !params().labelString().empty())
-               s += params().labelString() + ' ';
-
-       for (pos_type i = 0; i < size(); ++i) {
-               value_type c = getChar(i);
-               if (isPrintable(c))
-                       s += c;
-               else if (c == META_INSET &&
-                        getInset(i)->lyxCode() == InsetBase::MATH_CODE) {
-                       ostringstream os;
-                       getInset(i)->plaintext(buffer, os, runparams);
-                       s += subst(STRCONV(os.str()),'\n',' ');
-               }
-       }
-
-       return s;
-#else
-       // This should really be done by the caller and not here.
-       docstring ret = asString(buffer, runparams, 0, size(), label);
-       return subst(ret, '\n', ' ');
-#endif
+       return asString(buffer, 0, size(), label);
 }
 
 
@@ -1393,16 +1408,7 @@ docstring const Paragraph::asString(Buffer const & buffer,
                                 pos_type beg, pos_type end, bool label) const
 {
 
-       OutputParams const runparams;
-       return asString(buffer, runparams, beg, end, label);
-}
-
-
-docstring const Paragraph::asString(Buffer const & buffer,
-                                OutputParams const & runparams,
-                                pos_type beg, pos_type end, bool label) const
-{
-       lyx::odocstringstream os;
+       odocstringstream os;
 
        if (beg == 0 && label && !params().labelString().empty())
                os << params().labelString() << ' ';
@@ -1412,7 +1418,7 @@ docstring const Paragraph::asString(Buffer const & buffer,
                if (isPrintable(c))
                        os.put(c);
                else if (c == META_INSET)
-                       getInset(i)->textString(buffer, os, runparams);
+                       getInset(i)->textString(buffer, os);
        }
 
        return os.str();
@@ -1425,7 +1431,7 @@ void Paragraph::setInsetOwner(InsetBase * inset)
 }
 
 
-Change const Paragraph::lookupChange(pos_type pos) const
+Change const Paragraph::lookupChange(pos_type pos) const
 {
        BOOST_ASSERT(pos <= size());
        return pimpl_->lookupChange(pos);
@@ -1588,9 +1594,9 @@ bool Paragraph::hfillExpansion(Row const & row, pos_type pos) const
                return false;
        }
 
-       // expand at the beginning of a row only if it is the first row of a paragaph
+       // expand at the beginning of a row only if it is the first row of a paragraph
        if (pos == row.pos()) {
-               return row.pos() == 0;
+               return pos == 0;
        }
 
        // do not expand in some labels
@@ -1600,11 +1606,11 @@ bool Paragraph::hfillExpansion(Row const & row, pos_type pos) const
        // if there is anything between the first char of the row and
        // the specified position that is neither a newline nor an hfill,
        // the hfill will be expanded, otherwise it won't
-       pos_type i = row.pos();
-       while (i < pos && (isNewline(i) || isHfill(i))) {
-               ++i;
+       for (pos_type i = row.pos(); i < pos; i++) {
+               if (!isNewline(i) && !isHfill(i))
+                       return true;
        }
-       return i != pos;
+       return false;
 }