X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fsyntax.default;h=15ea23ce33341ffb121f0931eecf8c18c1fda06f;hb=3fef24069aca9ad6802717afb291aa392060d1b1;hp=8999b99e40a38c79a59b6df3bc59734326b8c18e;hpb=ef8e527612bc40ab2b671df6a90c4f2eb88a4e84;p=lyx.git

diff --git a/lib/syntax.default b/lib/syntax.default
index 8999b99e40..15ea23ce33 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 origianlly written by John Weiss 970311
+% 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,13 +118,14 @@ $$
 \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{}
 \epsfig{}
 \epsfxsize
 \epsfysize
+\fancyhead[]{}
 \footnote[]{}
 \footnotesize
 \H{}
@@ -262,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.
 \,
@@ -363,6 +362,7 @@ $$
 % support it, but only the "\mbox{" and the "}" need to be in TeX mode.
 
 \abstractname
+\Acrobatmenu{}{}         % from the hyperref package
 \addcontentsline{}{}{translate}
 \address{}
 \addtime{}
@@ -400,12 +400,12 @@ $$
 \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
@@ -422,7 +422,7 @@ $$
 \extracolsep{}
 \fbox{translate}
 \fcolorbox[]{,,}{,,}{}  % Two variants of this command
-%\fcolorbox{}{}{}    %  This variant doesn't matter to reLyX (adk)
+%\fcolorbox{}{}{}
 \figurename
 \floatpagefraction
 \flushbottom
@@ -445,8 +445,13 @@ $$
 \glossaryentry{}{}       %only in .glo file (JMarc)
 % \graphpaper[](,)(,)    %picture
 \headtoname
+\href{}{translate}       % from the hyperref package
 \hspace{}
 \hspace*{}
+\hyperdef{}{}{translate} % from the hyperref package
+\hyperlink{}{translate}  % from the hyperref package
+\hyperref{}{}{translate} % from the hyperref package
+\hypertarget{}{translate} % from the hyperref package
 \hyphenation{}
 \iflanguage{}{}{}
 \ifthenelse
@@ -500,11 +505,11 @@ $$
 \newboolean{}
 \newcommand{}[][]{}
 \newcommand*{}[][]{}
-%\newcommand{}[]{}    % reLyX doesn't care about missing optarg
+%\newcommand{}[]{}    % tex2lyx can support this when the file format is the one of LyX 1.6.x
 \newcounter{}[]
 \newenvironment{}[][]{}{}
 \newenvironment*{}[][]{}{}
-% \newenvironment{}[]{}{}    % reLyX doesn't care about missing optarg
+%\newenvironment{}[]{}{}    % tex2lyx can support this when the file format is the one of LyX 1.6.x
 \newfont{}{ scaled }
 \newlength{}
 \newpage
@@ -527,7 +532,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
@@ -538,6 +543,8 @@ $$
 \part[]{}
 \part*{}
 \partname
+\pdfbookmark[]{}{}       % from the hyperref package
+\pdfstringdef{}{}        % from the hyperref package
 \poptabs
 \prefacename
 \printindex
@@ -561,10 +568,10 @@ $$
 \refstepcounter{}
 \renewcommand{}[][]{}
 \renewcommand*{}[][]{}
-% \renewcommand{}[]{}   %reLyX doesn't care about variants
+%\renewcommand{}[]{}   % tex2lyx can support this when the file format is the one of LyX 1.6.x
 \renewenvironment{}[][]{}{}
 \renewenvironment*{}[][]{}{}
-% \renewenvironment{}[]{}{}
+%\renewenvironment{}[]{}{}
 \resizebox{}{}{translate}
 \resizebox*{}{}{translate}
 \reversemarginpar
@@ -616,9 +623,10 @@ $$
 \tableofcontents
 \tabularnewline[]
 \telephone{translate}
+\texorpdfstring{}{}      % from the hyperref package
 \textcircled{translate}
 \textcolor[]{,,}{translate}
-%\textcolor{}{}      % reLyX doesn't care about this version
+%\textcolor{}{}
 \textnormal{translate}
 \textfraction
 \thanks{translate}
@@ -638,7 +646,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
@@ -646,38 +654,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
@@ -685,6 +661,7 @@ titlepage
 \begin{environments}
 bibunit[]{translate}
 psmatrix[]{}
+thebibliography{}
 \end{environments}
 
 % Environments that start math mode.
@@ -714,3 +691,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{}