SCons: msvc does not need this /TP option any more after we rename .C => .cpp. Also...

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 1ec43ed1634621b2219c18c00520c8adbd5b7840..80409eafd704342f41d94268127d14f1f1ecbbf8 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1378,18 +1378,14 @@ Font const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
 {
        BOOST_ASSERT(pos >= 0);
 
-       Layout_ptr const & lout = layout();
+       Font font = getFontSettings(bparams, pos);
 
        pos_type const body_pos = beginOfBody();
-
-       Font layoutfont;
        if (pos < body_pos)
-               layoutfont = lout->labelfont;
+               font.realize(layout_->labelfont);
        else
-               layoutfont = lout->font;
+               font.realize(layout_->font);
 
-       Font font = getFontSettings(bparams, pos);
-       font.realize(layoutfont);
        font.realize(outerfont);
        font.realize(bparams.getFont());
 
@@ -1663,6 +1659,10 @@ docstring Paragraph::expandLabel(Layout_ptr const & layout,
        else
                fmt = translateIfPossible(layout->labelstring(), bparams);
 
+       if (fmt.empty() && layout->labeltype == LABEL_COUNTER 
+           && !layout->counter.empty())
+               fmt = "\\the" + layout->counter;
+
        // handle 'inherited level parts' in 'fmt',
        // i.e. the stuff between '@' in   '@Section@.\arabic{subsection}'
        size_t const i = fmt.find('@', 0);
@@ -1670,8 +1670,10 @@ docstring Paragraph::expandLabel(Layout_ptr const & layout,
                size_t const j = fmt.find('@', i + 1);
                if (j != docstring::npos) {
                        docstring parent(fmt, i + 1, j - i - 1);
-                       docstring label = expandLabel(tclass[parent], bparams);
-                       fmt = docstring(fmt, 0, i) + label + docstring(fmt, j + 1, docstring::npos);
+                       docstring label = expandLabel(tclass[parent], bparams,
+                                                     process_appendix);
+                       fmt = docstring(fmt, 0, i) + label 
+                               + docstring(fmt, j + 1, docstring::npos);
                }
        }