-
- // just an idea of me
- if (!pos) {
- tmp->params().lineTop(par->params().lineTop());
- tmp->params().pagebreakTop(par->params().pagebreakTop());
- tmp->params().spaceTop(par->params().spaceTop());
- tmp->bibkey = par->bibkey;
-
- par->bibkey = 0;
- par->params().clear();
-
- par->layout(bparams.getLyXTextClass().defaultLayout());
-
- // layout stays the same with latex-environments
- if (flag) {
- par->layout(tmp->layout());
- par->setLabelWidthString(tmp->params().labelWidthString());
- par->params().depth(tmp->params().depth());
+
+ if (pos)
+ return;
+
+ tmp->params().lineTop(par->params().lineTop());
+ tmp->params().pagebreakTop(par->params().pagebreakTop());
+ tmp->params().spaceTop(par->params().spaceTop());
+ tmp->bibkey = par->bibkey;
+
+ par->bibkey = 0;
+ par->params().clear();
+
+ par->layout(bparams.getLyXTextClass().defaultLayout());
+
+ // layout stays the same with latex-environments
+ if (flag) {
+ par->layout(tmp->layout());
+ par->setLabelWidthString(tmp->params().labelWidthString());
+ par->params().depth(tmp->params().depth());
+ }
+
+ // subtle, but needed to get empty pars working right
+ if (bparams.tracking_changes) {
+ if (!par->size()) {
+ par->cleanChanges();
+ } else if (!tmp->size()) {
+ tmp->cleanChanges();