From 340529920ea0fe947fcc74170bfa56036aa2fb9f Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Mon, 3 Dec 2012 13:55:20 +0100 Subject: [PATCH] Make \lyxadded and \lyxdeleted robust (#8435). (cherry picked from commit 39ec866f682d3997dc7c70450eeedbf7d13cb9b5) --- src/LaTeXFeatures.cpp | 12 ++++++------ status.20x | 40 +++++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index 66f91da9db..73938760b2 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -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" diff --git a/status.20x b/status.20x index 8ce73a6192..457045b356 100644 --- a/status.20x +++ b/status.20x @@ -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