X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fsyntax.default;h=d9596b6f86ce9ce9ff2690f1ae7b4d6d0ffa1e61;hb=6fde01e70ed70755ed0da9699da47fccf98abb11;hp=01fee6a29fd099aa830f108f34f89e4c08d634a4;hpb=85d2c5353275d6cb5de8597622ec8eb939284540;p=lyx.git

diff --git a/lib/syntax.default b/lib/syntax.default
index 01fee6a29f..d9596b6f86 100644
--- a/lib/syntax.default
+++ b/lib/syntax.default
@@ -142,6 +142,7 @@ $$
 \Large
 \LARGE
 \marginpar[]{}
+\mintinline[,]{}
 \multicolumn{}{}{}
 \newline
 \noindent
@@ -358,8 +359,21 @@ $$
 %
 % Arguments whose text is "translate" will have regular LaTeX in them (as
 % opposed to commands with special syntax) which should be translated by
-% reLyX like regular LaTeX. \mbox{} is an obvious example. LyX doesn't
+% tex2lyx like regular LaTeX. \mbox{} is an obvious example. LyX doesn't
 % support it, but only the "\mbox{" and the "}" need to be in TeX mode.
+% "translate" should be specified for as many arguments aspossible.
+% Besides the better on-screen display of the contents (a math inset looks
+% better than a formula in ERT), it enables LyX to apply some fixes to LaTeX
+% limitations: For example, footnotes in section headings do not work in
+% LaTeX, but LyX produces preamble code to fix that. Of course this works only
+% for footnote insets and not for footnotes in ERT. Example:
+% \section{title \texorpdfstring{\footnote{foo}}{bar}}
+% 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
@@ -387,7 +401,10 @@ $$
 \bottomfraction
 \caption[]{}
 \cc{}
+\ce{}
+\cf{}
 \ccname
+\cellcolor[]{}
 \centering
 \centerline{translate}
 \chapter[]{}
@@ -403,10 +420,11 @@ $$
 \cleardoublepage
 \clearpage
 \closing{}
-\color[]{,,}  % Two variants of this command and the next (jpw)
+\color[]{}  % Two variants of this command and the next (jpw)
 %\color{}
-\colorspec[]{,,}{}
+\colorspec[]{}{}
 %\colorspec{}{}
+\columncolor[]{}
 %\contentsline{}{\numberline{}  }{}     % Appears only in .toc file (JMarc)
 \contentsname
 %\dashbox{}(,)[]{}   %picture
@@ -419,7 +437,7 @@ $$
 \DeclareRobustCommandx{}[][]{} % xargs.sty
 \DeclareRobustCommandx*{}[][]{} % xargs.sty
 \def{}{}
-\definecolor{}{}{,,}
+\definecolor{}{}{}
 \DeleteShortVerb{} % from doc.sty, argument must be verbatim
 \DescribeMacro{}
 \discretionary{}{}{}
@@ -430,7 +448,7 @@ $$
 \ensuremath{}
 \extracolsep{}
 \fbox{translate}
-\fcolorbox[]{,,}{,,}{}  % Two variants of this command
+\fcolorbox[]{}{}{}  % Two variants of this command
 %\fcolorbox{}{}{}
 \figurename
 \floatpagefraction
@@ -466,7 +484,7 @@ $$
 \ifthenelse
 \includegraphics*[,][,]{} % LyX 1.0 doesn't support clipping figures
 \indent
-\index{}
+\index{translate}
 \indexentry{}{}        % only in .idx files (JMarc)
 \indexname
 \indexspace
@@ -505,8 +523,8 @@ $$
 \makelabels
 \maketitle
 \MakeShortVerb{} % from doc.sty, argument must be verbatim
-\markboth{}{translate}
-\markright{translate}
+\markboth{group}{group}
+\markright{group}
 \mathversion{}
 \mbox{translate}
 \mddefault
@@ -543,7 +561,7 @@ $$
 \opening{}
 % \oval(,)[]   %picture
 \pagebreak[]
-\pagecolor[]{,,}
+\pagecolor[]{}
 % \pagecolor{}    % tex2lyx can first care about this when fileformat 351 is supported
 \pagename
 \pagenumbering{}
@@ -559,7 +577,7 @@ $$
 \pdfstringdef{}{}        % from the hyperref package
 \poptabs
 \prefacename
-\printindex
+\printindex[]{}
 \protect
 \providecommand{}[][]{}
 \providecommand*{}[][]{}
@@ -595,7 +613,8 @@ $$
 \rmdefault
 \Roman{}
 \roman{}
-\rotatebox{}{translate}
+\rotatebox[]{}{translate}
+\rowcolor[]{}
 \rule[]{}{}
 \samepage
 \savebox{}[][]{}
@@ -620,29 +639,36 @@ $$
 \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
 \tableofcontents
 \tabularnewline[]
 \telephone{translate}
-\texorpdfstring{}{}      % from the hyperref package
+\texorpdfstring{translate}{translate} % from the hyperref package
 \textcircled{translate}
-\textcolor[]{,,}{translate}
+\textcolor[]{}{translate}
 %\textcolor{}{}
 \textbf{translate}     % hardcoded, but needed nevertheless for \let\xyz\textbf
 \textnormal{translate} % hardcoded, but needed nevertheless for \let\xyz\textnormal
@@ -679,6 +705,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":
@@ -686,36 +713,42 @@ $$
 % LaTeX code that can be translated to LyX.
 \begin{environments}
 bibunit[]{translate}
+listing{} % minted.sty
+minted{} % minted.sty
 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}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%