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

Make \lyxadded and \lyxdeleted robust (#8435).

Browse Source 
(cherry picked from commit 39ec866f68)
This commit is contained in:
Juergen Spitzmueller 2012-12-03 13:55:20 +01:00 committed by Richard Heck
parent 147b0cd049
commit 340529920e
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/LaTeXFeatures.cpp
View File

@ -182,19 +182,19 @@ static docstring const changetracking_dvipost_def = from_ascii(
"\\dvipost{osend color pop}\n"
"\\dvipost{cbstart color push Blue}\n"
"\\dvipost{cbend color pop}\n"
"\\newcommand{\\lyxadded}[3]{\\changestart#3\\changeend}\n"
"\\newcommand{\\lyxdeleted}[3]{%\n"
"\\DeclareRobustCommand{\\lyxadded}[3]{\\changestart#3\\changeend}\n"
"\\DeclareRobustCommand{\\lyxdeleted}[3]{%\n"
"\\changestart\\overstrikeon#3\\overstrikeoff\\changeend}\n");
static docstring const changetracking_xcolor_ulem_def = from_ascii(
"%% Change tracking with ulem\n"
"\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}{}#3}}\n"
"\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\sout{#3}}}\n");
"\\DeclareRobustCommand{\\lyxadded}[3]{{\\color{lyxadded}{}#3}}\n"
"\\DeclareRobustCommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\sout{#3}}}\n");
static docstring const changetracking_xcolor_ulem_hyperref_def = from_ascii(
"%% Change tracking with ulem\n"
"\\newcommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}{}}{}#3}}\n"
"\\newcommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\sout{#3}}{}}}\n");
"\\DeclareRobustCommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}{}}{}#3}}\n"
"\\DeclareRobustCommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\sout{#3}}{}}}\n");
static docstring const changetracking_none_def = from_ascii(
"\\newcommand{\\lyxadded}[3]{#3}\n"

40
status.20x
View File

@ -101,12 +101,6 @@ What's new
- In order to avoid NFSS problems with certain font packages, load the needed
font encodings when inserting Cyrillic and/or Greek characters (bug 8467).
- Fix the output of LyXHTML bibliography with richtext (bug 8486).
- Fix linking from citation to bibliography in LyXHTML output (bug 8490).
- Use document language when exporting citations to LyXHTML (bug 7732).
- Reordering citations in LyX is now rendered in the output (bug 6955).
- Fix InsetLayout's LatexParam output: \begin{inset}[latexparam].
@ -116,21 +110,9 @@ What's new
- Properly output alias for formatted chapter references, so prettyref
documents work when converted tor refstyle.
- Do not convert --- and -- to entities when outputting listings to
XHTML (bug 8561).
- Fix lyx2lyx bug with non-ASCII layout file names (Debian bug 700828).
- Reset counters properly when outputting included XHTML files (bug 8598).
- Translate "elsewhere" when outputting XHTML (bug 8587).
- Fix problem with XHTML output of captions with listings (bug 8604).
- Fix problem with HTML output of simple formulas like "y[i]" (bug 8609).
- Clean ids for citations before outputting them. Characters like ":" are
not allowed in HTML identifiers, apparently (bug 8606).
- Made \lyxadded and \lyxdeleted robust (bug 8435).
* USER INTERFACE
@ -186,6 +168,26 @@ What's new
* LYXHTML
- Reset counters properly when outputting included XHTML files (bug 8598).
- Fix the output of LyXHTML bibliography with richtext (bug 8486).
- Fix linking from citation to bibliography in LyXHTML output (bug 8490).
- Use document language when exporting citations to LyXHTML (bug 7732).
- Do not convert --- and -- to entities when outputting listings to
XHTML (bug 8561).
- Translate "elsewhere" when outputting XHTML (bug 8587).
- Fix problem with XHTML output of captions with listings (bug 8604).
- Fix problem with HTML output of simple formulas like "y[i]" (bug 8609).
- Clean ids for citations before outputting them. Characters like ":" are
not allowed in HTML identifiers, apparently (bug 8606).
* TEX2LYX