anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.lyx.org:lyx

Browse Source
This commit is contained in:
Uwe Stöhr 2014-04-28 22:57:23 +02:00
commit 40aedb5146
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lyx2lyx/lyx_2_1.py
View File

@ -911,7 +911,7 @@ def revert_cell_rotation(document):
document.body[i] = rgx.sub('', document.body[i]) document.body[i] = rgx.sub('', document.body[i])
elif value == "90": elif value == "90":
rgx = re.compile(r' rotate="[^"]+?"') rgx = re.compile(r' rotate="[^"]+?"')
document.body[i] = rgx.sub('rotate="true"', document.body[i]) document.body[i] = rgx.sub(' rotate="true"', document.body[i])
else: else:
rgx = re.compile(r' rotate="[^"]+?"') rgx = re.compile(r' rotate="[^"]+?"')
load_rotating = True load_rotating = True

5
src/LyXRC.cpp
View File

@ -2829,8 +2829,9 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
break; break;
} }
case RC_DEFAULT_OTF_VIEW_FORMAT: case RC_DEFAULT_OTF_VIEW_FORMAT:
if (ignore_system_lyxrc || if ((ignore_system_lyxrc ||
default_otf_view_format != system_lyxrc.default_otf_view_format) { default_otf_view_format != system_lyxrc.default_otf_view_format)
&& !default_otf_view_format.empty()) {
os << "\\default_otf_view_format " << default_otf_view_format << '\n'; os << "\\default_otf_view_format " << default_otf_view_format << '\n';
} }
if (tag != RC_LAST) if (tag != RC_LAST)