X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fsyntax.default;h=0ef1775001359abf2e12e066da7b5c6a89e41849;hb=669acb47c58e1e573d77518c75dbb673af877085;hp=0a4a193d784746d67c6b3b6a7e35e4759f6348f1;hpb=87944eedc77693238343103138c91ac7e2faab8f;p=lyx.git

diff --git a/lib/syntax.default b/lib/syntax.default
index 0a4a193d78..0ef1775001 100644
--- a/lib/syntax.default
+++ b/lib/syntax.default
@@ -370,6 +370,9 @@ $$
 % is some code that may occur in a .tex file created by LyX. The re-import
 % works only because the first argument of \texorpdfstring is specified as
 % translatable in this file.
+% If a command puts the contents of an argument inside an own group, use
+% "group" instead of "translate". Otherwise things like font changes would
+% survive the end of the group in LyX (bug 3036).
 
 \abstractname
 \Acrobatmenu{}{}         % from the hyperref package
@@ -397,6 +400,8 @@ $$
 \bottomfraction
 \caption[]{}
 \cc{}
+\ce{}
+\cf{}
 \ccname
 \centering
 \centerline{translate}
@@ -476,7 +481,7 @@ $$
 \ifthenelse
 \includegraphics*[,][,]{} % LyX 1.0 doesn't support clipping figures
 \indent
-\index{}
+\index{translate}
 \indexentry{}{}        % only in .idx files (JMarc)
 \indexname
 \indexspace
@@ -515,8 +520,8 @@ $$
 \makelabels
 \maketitle
 \MakeShortVerb{} % from doc.sty, argument must be verbatim
-\markboth{}{translate}
-\markright{translate}
+\markboth{group}{group}
+\markright{group}
 \mathversion{}
 \mbox{translate}
 \mddefault
@@ -569,7 +574,7 @@ $$
 \pdfstringdef{}{}        % from the hyperref package
 \poptabs
 \prefacename
-\printindex
+\printindex[]{}
 \protect
 \providecommand{}[][]{}
 \providecommand*{}[][]{}
@@ -630,20 +635,27 @@ $$
 \shortstack[]{translate}
 \showhyphens{}
 \signature{}
+\sindex[]{translate} %splitidx.sty
 \sldefault
 \sloppy
 \stepcounter{}
 \stretch{}
 %\subitem{}   % unsupported theindex environment
+\subcaption[translate]{translate}
+\subcaptionbox[translate]{translate}[][]{translate} % subcaption.sty
+\subcaptionbox*{translate}[][]{translate} % subcaption.sty
 \subjectname
-\subfigure[]{translate}
+\subfigure[translate][translate]{translate} % obsolete subfigure.sty
 \subparagraph[]{}  % These "sub" versions of the sectioning commands weren't
 \subparagraph*{}   % in the original commandlist for some reason (adk)
+\subref{} % subcaption.sty
+\subref*{} % subcaption.sty
 \subsection[]{}    %
 \subsection*{}     %
 \subsubsection[]{} %
 \subsubsection*{}  %
 %\subsubitem{}   % unsupported theindex environment
+\subtable[translate][translate]{translate} % obsolete subfigure.sty
 \suppressfloats[]
 \symbol{}
 \tablename
@@ -689,6 +701,7 @@ $$
 \vspace{}
 \vspace*{}
 \whiledo{}{}
+\xymatrix{} % this is basically an array => the contents would be parsed badly (bug 8396)
 
 % LaTeX environments.
 % They have always one extra "argument":
@@ -697,35 +710,39 @@ $$
 \begin{environments}
 bibunit[]{translate}
 psmatrix[]{}
+subfigure[]{translate} % subcaption.sty
+subtable[]{translate} % subcaption.sty
+theorem[]{translate} % from amsthm.sty and probably others
 thebibliography{}
+tikzpicture[]{}
 \end{environments}
 
 % Environments that start math mode.
 % $...$, $$...$$, \(...\) and \[...\] are hardcoded in tex2lyx.
-% The arguments are currently ignored.
+% The arguments are currently ignored (apart from displaymath).
 \begin{mathenvironments}
-equation
-equation*
-eqnarray
-eqnarray*
-align
-align*
-gather
-gather*
-multline
-multline*
-math
-displaymath
-flalign
-flalign
+equation{displaymath}
+equation*{displaymath}
+eqnarray{displaymath}
+eqnarray*{displaymath}
+align{displaymath}
+align*{displaymath}
+gather{displaymath}
+gather*{displaymath}
+multline{displaymath}
+multline*{displaymath}
+math{}
+displaymath{displaymath}
+flalign{displaymath}
+flalign{displaymath}
 % These require extra args
-alignat
-alignat*
-xalignat
-xalignat*
-xxalignat
+alignat{}{displaymath}
+alignat*{displaymath}
+xalignat{}{displaymath}
+xalignat*{}{displaymath}
+xxalignat{}{displaymath}
 % These are not known by LyX but work nevertheless:
-empheq
+empheq[]{}{displaymath}
 \end{mathenvironments}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%