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

backport r39696

Browse Source 
Timestamp: 
09/17/11 17:25:14 (5 days ago) 
Author: 
spitz 
Message: 
finally commit the fix for #7607.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39729 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2011-09-22 07:49:25 +00:00
parent c4c0978b8f
commit 6c27ed49fa
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/output_latex.cpp
View File

@ -720,6 +720,7 @@ void TeXOnePar(Buffer const & buf,
} }
bool pending_newline = false; bool pending_newline = false;
bool unskip_newline = false;
switch (style.latextype) { switch (style.latextype) {
case LATEX_ITEM_ENVIRONMENT: case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT:
@ -793,6 +794,7 @@ void TeXOnePar(Buffer const & buf,
"$$lang", "$$lang",
current_lang)); current_lang));
pending_newline = true; pending_newline = true;
unskip_newline = true;
} }
} else if (!par_lang.empty()) { } else if (!par_lang.empty()) {
os << from_ascii(subst( os << from_ascii(subst(
@ -800,14 +802,19 @@ void TeXOnePar(Buffer const & buf,
"$$lang", "$$lang",
par_lang)); par_lang));
pending_newline = true; pending_newline = true;
unskip_newline = true;
} }
} }
} }
if (closing_rtl_ltr_environment) if (closing_rtl_ltr_environment)
os << "}"; os << "}";
if (pending_newline) if (pending_newline) {
if (unskip_newline)
// prevent unwanted whitespace
os << '%';
os << '\n'; os << '\n';
}
// if this is a CJK-paragraph and the next isn't, close CJK // if this is a CJK-paragraph and the next isn't, close CJK
// also if the next paragraph is a multilingual environment (because of nesting) // also if the next paragraph is a multilingual environment (because of nesting)

2
status.20x
View File

@ -82,6 +82,8 @@ What's new
- Fix XHTML export of branches (bug 7721). - Fix XHTML export of branches (bug 7721).
- Fix whitespace issues with language changes (bug 7607).
* USER INTERFACE * USER INTERFACE