PDFOptions.cpp: set all string containing options to \hypersetup

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index bc2d3257a0c486d65a1285425342fdbd2ff17834..7514a1a436dfa971411d2d29013da0cff17f62a7 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -14,14 +14,16 @@
 
 #include "BufferParams.h"
 #include "debug.h"
+#include "Layout.h"
 #include "Text.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 
+#include <boost/next_prior.hpp>
+
 
 namespace lyx {
 
-using std::string;
 using std::endl;
 
 
@@ -134,7 +136,10 @@ void breakParagraph(BufferParams const & bparams,
        }
 
        if (!isempty) {
+               bool const soa = par.params().startOfAppendix();
                par.params().clear();
+               // do not lose start of appendix marker (bug 4212)
+               par.params().startOfAppendix(soa);
                par.layout(bparams.getTextClass().defaultLayout());
        }
 
@@ -258,7 +263,7 @@ int getEndLabel(pit_type p, ParagraphList const & pars)
        pit_type pit = p;
        depth_type par_depth = pars[p].getDepth();
        while (pit != pit_type(pars.size())) {
-               Layout_ptr const & layout = pars[pit].layout();
+               LayoutPtr const & layout = pars[pit].layout();
                int const endlabeltype = layout->endlabeltype;
 
                if (endlabeltype != END_LABEL_NO_LABEL) {