* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "tex2lyx.h"
-#include "Context.h"
+#include "Context.h"
#include "TextClass.h"
#include "Layout.h"
+#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/ExceptionMessage.h"
#include "support/os.h"
#include "support/Package.h"
+#include <cstdlib>
#include <fstream>
#include <iostream>
#include <string>
namespace lyx {
-// Hacks to allow the thing to link in the lyxlayout stuff
-LayoutPtr captionlayout;
-
-
string const trim(string const & a, char const * p)
{
- // BOOST_ASSERT(p);
+ // LASSERT(p, /**/);
if (a.empty() || !*p)
return a;
void add_known_command(string const & command, string const & o1,
- unsigned optionalsNum)
+ bool o2)
{
// We have to handle the following cases:
// definition o1 o2 invocation result
// \newcommand{\foo}[1][]{bar #1} "[1]" true \foo bar
// \newcommand{\foo}[1][]{bar #1} "[1]" true \foo[x] bar x
// \newcommand{\foo}[1][x]{bar #1} "[1]" true \foo[x] bar x
- // and the same with \newlyxcommand
unsigned int nargs = 0;
vector<ArgumentType> arguments;
string const opt1 = rtrim(ltrim(o1, "["), "]");
if (isStrUnsignedInt(opt1)) {
// The command has arguments
nargs = convert<unsigned int>(opt1);
- for (unsigned int i = 0; i < optionalsNum; ++i) {
+ if (nargs > 0 && o2) {
+ // The first argument is optional
arguments.push_back(optional);
--nargs;
}
//p.dump();
stringstream ss;
- TeX2LyXDocClass textclass = parse_preamble(p, ss, documentclass);
- captionlayout = LayoutPtr(Layout::forCaption());
+ TeX2LyXDocClass textclass;
+ parse_preamble(p, ss, documentclass, textclass);
active_environments.push_back("document");
Context context(true, textclass);
{
using namespace lyx;
+ //setlocale(LC_CTYPE, "");
+
lyxerr.setStream(cerr);
easyParse(argc, argv);
os::init(argc, argv);
- try { init_package(internal_path(to_utf8(from_local8bit(argv[0]))),
+ try {
+ init_package(internal_path(to_utf8(from_local8bit(argv[0]))),
cl_system_support, cl_user_support,
top_build_dir_is_two_levels_up);
} catch (ExceptionMessage const & message) {
if (message.type_ == ErrorException)
exit(1);
}
-
+
// Now every known option is parsed. Look for input and output
// file name (the latter is optional).
string infilename = internal_path(to_utf8(from_local8bit(argv[1])));
infilename = makeAbsPath(infilename).absFilename();
-
+
string outfilename;
if (argc > 2) {
outfilename = internal_path(to_utf8(from_local8bit(argv[2])));