anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve the lyx2latex function.

Browse Source 
- Avoid processing lines of a note inset, as we are going to discard them
- Translate the horizontal space inset
- Correct translation of \backslash
- Correct translation of ^ (\^ is an accent in latex)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34799 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2010-07-07 10:16:53 +00:00
parent 98a12f1698
commit 63511e17f8
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/lyx2lyx/lyx_2_0.py
View File

@ -155,10 +155,18 @@ def lyx2latex(document, lines):
content = "" content = ""
ert_end = 0 ert_end = 0
note_end = 0 note_end = 0
hspace = ""
for curline in range(len(lines)): for curline in range(len(lines)):
line = lines[curline] line = lines[curline]
if line.startswith("\\begin_inset ERT"): if line.startswith("\\begin_inset Note Note"):
# We want to skip LyX notes, so remember where the inset ends
note_end = find_end_of_inset(lines, curline + 1)
continue
elif note_end >= curline:
# Skip LyX notes
continue
elif line.startswith("\\begin_inset ERT"):
# We don't want to replace things inside ERT, so figure out # We don't want to replace things inside ERT, so figure out
# where the end of the inset is. # where the end of the inset is.
ert_end = find_end_of_inset(lines, curline + 1) ert_end = find_end_of_inset(lines, curline + 1)
@ -182,10 +190,22 @@ def lyx2latex(document, lines):
line = "''" line = "''"
else: else:
line = "'" line = "'"
elif line.startswith("\\begin_inset Note Note"): elif line.startswith("\\begin_inset space"):
# We want to skip LyX notes, so remember where the inset ends line = line[18:].strip()
note_end = find_end_of_inset(lines, curline + 1) if line.startswith("\\hspace"):
continue # Account for both \hspace and \hspace*
hspace = line[:-2]
continue
elif line == "\\space{}":
line = "\\ "
elif line == "\\thinspace{}":
line = "\\,"
elif hspace != "":
# The LyX length is in line[8:], after the \length keyword
# latex_length returns "bool,length"
length = latex_length(line[8:]).split(",")[1]
line = hspace + "{" + length + "}"
hspace = ""
elif line.isspace() or \ elif line.isspace() or \
line.startswith("\\begin_layout") or \ line.startswith("\\begin_layout") or \
line.startswith("\\end_layout") or \ line.startswith("\\end_layout") or \
@ -197,10 +217,6 @@ def lyx2latex(document, lines):
#skip all that stuff #skip all that stuff
continue continue
# Skip LyX notes
if note_end >= curline:
continue
# this needs to be added to the preamble because of cases like # this needs to be added to the preamble because of cases like
# \textmu, \textbackslash, etc. # \textmu, \textbackslash, etc.
add_to_preamble(document, ['% added by lyx2lyx for converted index entries', add_to_preamble(document, ['% added by lyx2lyx for converted index entries',
@ -209,14 +225,15 @@ def lyx2latex(document, lines):
# a lossless reversion is not possible # a lossless reversion is not possible
# try at least to handle some common insets and settings # try at least to handle some common insets and settings
if ert_end >= curline: if ert_end >= curline:
line = line.replace(r'\backslash', r'\\') line = line.replace(r'\backslash', '\\')
else: else:
line = line.replace('&', '\\&{}') # No need to add "{}" after single-nonletter macros
line = line.replace('#', '\\#{}') line = line.replace('&', '\\&')
line = line.replace('^', '\\^{}') line = line.replace('#', '\\#')
line = line.replace('%', '\\%{}') line = line.replace('^', '\\textasciicircum{}')
line = line.replace('_', '\\_{}') line = line.replace('%', '\\%')
line = line.replace('$', '\\${}') line = line.replace('_', '\\_')
line = line.replace('$', '\\$')
# Do the LyX text --> LaTeX conversion # Do the LyX text --> LaTeX conversion
for rep in unicode_reps: for rep in unicode_reps: