commit b1bfbfb3f9801d41257e29f43d5f78ebcafb9823
Author: Georg Baum <[email protected]>
Date: Sat Jan 3 18:43:01 2015 +0100
Adjust subfigure and subcaption options
diff --git a/lib/syntax.default b/lib/syntax.default
index 5a94049..dde67be 100644
--- a/lib/syntax.default
+++ b/lib/syntax.default
@@ -641,8 +641,9 @@ $$
\stepcounter{}
\stretch{}
%\subitem{} % unsupported theindex environment
+\subcaption[translate]{translate}
\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)
\subsection[]{} %
@@ -650,6 +651,7 @@ $$
\subsubsection[]{} %
\subsubsection*{} %
%\subsubitem{} % unsupported theindex environment
+\subtable[translate][translate]{translate} % obsolete subfigure.sty
\suppressfloats[]
\symbol{}
\tablename
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 875df9f..9d75d7d 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2813,8 +2813,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags,
bool outer,
}
else if (t.cs() == "subfloat") {
- // the syntax is \subfloat[caption]{content}
+ // the syntax is \subfloat[list entry][sub
caption]{content}
// if it is a table of figure depends on the
surrounding float
+ // FIXME: second optional argument is not parsed
bool has_caption = false;
p.skip_spaces();
// do nothing if there is no outer float
