X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fsyntax.default;h=0a4a193d784746d67c6b3b6a7e35e4759f6348f1;hb=68393ecd7d4381d39dbbf0582353bc531a526cb3;hp=228228e26a16dde0043211b92aac249c723627b0;hpb=5451d467942e382647125423ec481f0072c20dd5;p=lyx.git

diff --git a/lib/syntax.default b/lib/syntax.default
index 228228e26a..0a4a193d78 100644
--- a/lib/syntax.default
+++ b/lib/syntax.default
@@ -1,8 +1,8 @@
 % This is the default list of commands for tex conversion programs to read
 %    It tells how many arguments each command takes, and which of them
 % (if any) are optional.
-%    It is taken from the list of commands written by John Weiss 970311 for reLyX
-% plus the math commands from math_hash.C
+%    It is taken from the list of commands originally written by John Weiss
+% 1997-03-11 for reLyX plus the math commands from math_hash.C
 %
 % Also had to add textrm etc. commands and many size commands (like \small)
 %
@@ -55,9 +55,9 @@ $$
 \`{}
 \~{}
 \b{}
-% \begin{}[]   %reLyX will get confused if \begin is found in this file!
+%\begin{}[]   %tex2lyx will get confused if \begin is found in this file!
 %\begin{}[]{} % All of these show the different variations of \begin (jpw)
-%\begin{}{}   % reLyX can only handle \begin{}
+%\begin{}{}
 %\begin{}{}{}
 %\begin{}[][][]{}
 %\begin{}(,)
@@ -118,7 +118,7 @@ $$
 \documentstyle[]{}
 \em
 \emph{}
-% \end{}   %reLyX will get confused if \end is found in this file!
+%\end{}   %tex2lyx will get confused if \end is found in this file!
 \epsf{}
 \epsfbox{}
 \epsffile{}
@@ -263,8 +263,6 @@ $$
 % arguments] and those that insert lists, since a list isn't a single
 % object.
 %
-% I had to remove things that TeX.pm doesn't recognize as a token, and hardcode
-%   those into reLyX. This included !' ?' -- --- and maybe some other things
 
 \ % A "\" followed by a space.
 \,
@@ -360,8 +358,18 @@ $$
 %
 % 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.
 
 \abstractname
 \Acrobatmenu{}{}         % from the hyperref package
@@ -396,24 +404,33 @@ $$
 \chapter*{}
 \chaptername
 \check{}
+\CheckCommand{}[][]{}
+\CheckCommand*{}[][]{}
+\CheckCommandx{}[][]{} % xargs.sty
+\CheckCommandx*{}[][]{} % xargs.sty
 %\circle{}    % picture environment (JMarc)
 %\circle*{}
 \cleardoublepage
 \clearpage
 \closing{}
 \color[]{,,}  % Two variants of this command and the next (jpw)
-% \color{}    %  This variant doesn't matter to reLyX (adk)
+%\color{}
 \colorspec[]{,,}{}
-%\colorspec{}{}    %  This variant doesn't matter to reLyX (adk)
+%\colorspec{}{}
 %\contentsline{}{\numberline{}  }{}     % Appears only in .toc file (JMarc)
 \contentsname
-% \dashbox{}(,)[]{}   %picture
+%\dashbox{}(,)[]{}   %picture
 \date{}
 \dblfigrule
 \dblfloatpagefraction
 \dbltopfraction
+\DeclareRobustCommand{}[][]{}
+\DeclareRobustCommand*{}[][]{}
+\DeclareRobustCommandx{}[][]{} % xargs.sty
+\DeclareRobustCommandx*{}[][]{} % xargs.sty
 \def{}{}
 \definecolor{}{}{,,}
+\DeleteShortVerb{} % from doc.sty, argument must be verbatim
 \DescribeMacro{}
 \discretionary{}{}{}
 \encl{}
@@ -424,7 +441,7 @@ $$
 \extracolsep{}
 \fbox{translate}
 \fcolorbox[]{,,}{,,}{}  % Two variants of this command
-%\fcolorbox{}{}{}    %  This variant doesn't matter to reLyX (adk)
+%\fcolorbox{}{}{}
 \figurename
 \floatpagefraction
 \flushbottom
@@ -479,7 +496,7 @@ $$
 \labelitemiv
 \language{}
 % We need this because the arguments must not be interpreted
-\let{}{}
+\let{item}{item}
 % \line(,){}    %picture
 \linebreak[]
 \linethickness{}
@@ -497,6 +514,7 @@ $$
 \makelabel{translate}
 \makelabels
 \maketitle
+\MakeShortVerb{} % from doc.sty, argument must be verbatim
 \markboth{}{translate}
 \markright{translate}
 \mathversion{}
@@ -507,11 +525,13 @@ $$
 \newboolean{}
 \newcommand{}[][]{}
 \newcommand*{}[][]{}
-%\newcommand{}[]{}    % reLyX doesn't care about missing optarg
+\newcommandx{}[][]{} % xargs.sty
+\newcommandx∗{}[][]{} % xargs.sty
 \newcounter{}[]
 \newenvironment{}[][]{}{}
 \newenvironment*{}[][]{}{}
-% \newenvironment{}[]{}{}    % reLyX doesn't care about missing optarg
+\newenvironmentx{}[][]{}{} % xargs.sty
+\newenvironmentx*{}[][]{}{} % xargs.sty
 \newfont{}{ scaled }
 \newlength{}
 \newpage
@@ -534,7 +554,7 @@ $$
 % \oval(,)[]   %picture
 \pagebreak[]
 \pagecolor[]{,,}
-% \pagecolor{}    % reLyX doesn't care about this version
+% \pagecolor{}    % tex2lyx can first care about this when fileformat 351 is supported
 \pagename
 \pagenumbering{}
 \par
@@ -553,6 +573,8 @@ $$
 \protect
 \providecommand{}[][]{}
 \providecommand*{}[][]{}
+\providecommandx{}[][]{} % xargs.sty
+\providecommandx*{}[][]{} % xargs.sty
 \ps
 \psfrag{}[][][][]{translate}
 \psfrag*{}[][][][]{translate}
@@ -570,10 +592,13 @@ $$
 \refstepcounter{}
 \renewcommand{}[][]{}
 \renewcommand*{}[][]{}
-% \renewcommand{}[]{}   %reLyX doesn't care about variants
+\renewcommandx{}[][]{} % xargs.sty
+\renewcommandx∗{}[][]{} % xargs.sty
 \renewenvironment{}[][]{}{}
 \renewenvironment*{}[][]{}{}
-% \renewenvironment{}[]{}{}
+%\renewenvironment{}[]{}{}
+\renewenvironmentx{}[][]{}{} % xargs.sty
+\renewenvironmentx*{}[][]{}{} % xargs.sty
 \resizebox{}{}{translate}
 \resizebox*{}{}{translate}
 \reversemarginpar
@@ -625,11 +650,20 @@ $$
 \tableofcontents
 \tabularnewline[]
 \telephone{translate}
-\texorpdfstring{}{}      % from the hyperref package
+\texorpdfstring{translate}{translate} % from the hyperref package
 \textcircled{translate}
 \textcolor[]{,,}{translate}
-%\textcolor{}{}      % reLyX doesn't care about this version
-\textnormal{translate}
+%\textcolor{}{}
+\textbf{translate}     % hardcoded, but needed nevertheless for \let\xyz\textbf
+\textnormal{translate} % hardcoded, but needed nevertheless for \let\xyz\textnormal
+\textmd{translate}     % hardcoded, but needed nevertheless for \let\xyz\textmd
+\textit{translate}     % hardcoded, but needed nevertheless for \let\xyz\textit
+\textrm{translate}     % hardcoded, but needed nevertheless for \let\xyz\textrm
+\textsc{translate}     % hardcoded, but needed nevertheless for \let\xyz\textsc
+\textsf{translate}     % hardcoded, but needed nevertheless for \let\xyz\textsf
+\textsl{translate}     % hardcoded, but needed nevertheless for \let\xyz\textsl
+\texttt{translate}     % hardcoded, but needed nevertheless for \let\xyz\texttt
+\textup{translate}     % hardcoded, but needed nevertheless for \let\xyz\textup
 \textfraction
 \thanks{translate}
 \thicklines
@@ -648,7 +682,7 @@ $$
 \usepackage[]{}[]
 \value{}
 % \vector(,){}   %picture
-% \verb||     % reLyX needs \verb to be hardcoded
+% \verb||     % tex2lyx fails on \verb, see http://www.lyx.org/trac/ticket/4468 and http://www.lyx.org/trac/ticket/5408
 % \verb*||
 \visible
 \vline
@@ -656,38 +690,6 @@ $$
 \vspace*{}
 \whiledo{}{}
 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% There are some environments which reLyX doesn't have an equivalent for.
-% However, *within* that environment, simple translatable LaTeX appears.
-% (E.g., this doesn't include something like "picture" because the TeX
-% parser can't (yet?) understand the parentheses as being delimiters of
-% coordinates rather than plain text.)
-%    The environment names are placed in a "reLyXre" environment.
-%    There aren't very many of these; the idea is that the user can add
-% user-defined environments in personal syntax files
-
-\begin{reLyXre}
-% filecontents can only appear before \documentclass command, so not worth it
-fussypar
-sloppypar
-% slide only appears in the slides class, but if we don't put this in, then
-% the whole document will be copied in TeX mode!
-slide
-titlepage
-\end{reLyXre}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Keep bugging André until he adds 'support' for these in mathed,
-% meaning that they can be removed from here.
-
-\begin{reLyXmt}
-\sb    {_}
-\sp    {^}
-\ensuremath   {}  % If it's in math mode, \ensuremath is unnec.
-\end{reLyXmt}
-
-
 % LaTeX environments.
 % They have always one extra "argument":
 % It contains "translate" if the contents of the environment contains normal
@@ -725,3 +727,20 @@ xxalignat
 % These are not known by LyX but work nevertheless:
 empheq
 \end{mathenvironments}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Sweave stuff
+\Sexpr{}
+\SweaveOpts{}
+\SweaveInput{}
+\SweaveSyntax{}
+\Scoderef{}
+
+\Rcode{}
+\Robject{}
+\Rcommand{}
+\Rfunction{}
+\Rfunarg{}
+\Rpackage{}
+\Rclass{}
+\Rmethod{}