anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-19 05:53:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 2841

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@16934 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2007-01-29 19:27:00 +00:00
parent 6e4f3afcac
commit 559278fc0b
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2007-01-29 José Matos <jamatos@lyx.org>
* output_docbook.C (makeEnvironment): If a sub list (embedded
list) appears next with a different depth, then there is no need
to open another tag at the current depth. (from Harshula
Jayasuriya). (bug 2841)
2007-01-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* text3.C (cursorPrevious, cursorNext): take the selection()

16
src/output_docbook.C
View File

@ -160,7 +160,13 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
sgml::closeTag(os, bstyle->labeltag());
}
wrapper = defaultstyle->latexname();
// If a sub list (embedded list) appears next with a
// different depth, then there is no need to open
// another tag at the current depth.
if(par->params().depth() == pbegin->params().depth()) {
sgml::openTag(os, bstyle->itemtag());
}
break;
default:
break;
}
@ -197,7 +203,17 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
}
break;
case LATEX_ITEM_ENVIRONMENT:
// If a sub list (embedded list) appears next, then
// there is no need to close the current tag.
// par should have already been incremented to the next
// element. So we can compare the depth of the next
// element with pbegin.
// We need to be careful, that we don't dereference par
// when par == pend but at the same time that the
// current tag is closed.
if((par != pend && par->params().depth() == pbegin->params().depth()) || par == pend) {
sgml::closeTag(os, bstyle->itemtag());
}
if (!bstyle->labeltag().empty())
sgml::closeTag(os, bstyle->innertag());
break;

2
status.14x
View File

@ -214,6 +214,8 @@ What's new
- Fix some crashes (with console error message "break on pointer: ...")
related to large insets.
- Fix nested list (like) output in docbook (bug 2841)
* Build/installation:
- Allow autoconf 2.60 and 2.61 for building.