anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

split out header parsing

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6454 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-03-12 02:39:12 +00:00
parent 36980dce96
commit 868f59f137
13 changed files with 419 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
development/FORMAT
View File

@ -1,5 +1,12 @@
Changes to the LyX format since version 220 (LyX 1.2.0) was released.
=====================================================================
LyX file-format changes
-----------------------
2003-03-12 John Levon <levon@movementarian.org>
* Added \\end_header to signify the end of the header in a
more robust fashion.
* use_amsmath is now a tristate {0 = never, 1 = auto, 2 = always}
2003-02-10 John Levon <levon@movementarian.org>

4
lib/ChangeLog
View File

@ -1,3 +1,7 @@
2003-03-12 John Levon <levon@movementarian.org>
* lyx2lyx/lyxconvert_221.py: add \\end_header
2003-03-11 Dekel Tsur <dekelts@tau.ac.il>
* lyx2lyx/lyxconvert_218.py (change_infoinset): Convert Info insets

5
lib/lyx2lyx/lyxconvert_221.py
View File

@ -15,10 +15,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
def add_end(header):
header.append("\\end_header");
def convert(header, body):
pass
add_end(header)
if __name__ == "__main__":
pass

2
src/BufferView.C
View File

@ -323,7 +323,7 @@ bool BufferView::insertLyXFile(string const & filen)
} else {
lyxerr[Debug::INFO] << "Will insert file without header"
<< endl;
res = buffer()->readLyXformat2(lex, text->cursor.par());
res = buffer()->readBody(lex, text->cursor.par());
}
resize();

11
src/ChangeLog
View File

@ -1,3 +1,14 @@
2003-03-12 John Levon <levon@movementarian.org>
* BufferView.C:
* tabular.C:
* buffer.h:
* buffer.C:
* bufferparams.h:
* bufferparams.C: move author list into params. Rename some
functions. Move the header reading into a separate token
loop. Move the header token reading into BufferParams.
2003-03-12 John Levon <levon@movementarian.org>
* changes.C: put debug inside lyxerr.debugging() checks

412
src/buffer.C
View File

@ -163,7 +163,7 @@ Buffer::Buffer(string const & file, bool ronly)
}
// set initial author
authorlist.record(Author(lyxrc.user_name, lyxrc.user_email));
authors().record(Author(lyxrc.user_name, lyxrc.user_email));
}
@ -246,7 +246,7 @@ void Buffer::setReadonly(bool flag)
AuthorList & Buffer::authors()
{
return authorlist;
return params.authorlist;
}
@ -280,17 +280,56 @@ void Buffer::setFileName(string const & newfile)
// We'll remove this later. (Lgb)
namespace {
string last_inset_read;
#ifdef WITH_WARNINGS
#warning And _why_ is this here? (Lgb)
#warning this is never set to != 0 !!! - remove ?
#endif
int unknown_layouts;
int unknown_tokens;
vector<int> author_ids;
void unknownClass(string const & unknown)
{
string msg =
#if USE_BOOST_FORMAT
boost::io::str(boost::format(
_("The document uses an unknown textclass \"%1$s\".")) % unknown)
+ _("-- substituting default.");
#else
_("The document uses an unknown textclass ")
+ unknown + _("-- substituting default.");
#endif
Alert::alert(_("Textclass error"), msg);
}
} // anon
int Buffer::readHeader(LyXLex & lex)
{
int unknown_tokens = 0;
while (lex.isOK()) {
lex.nextToken();
string const token = lex.getString();
if (token.empty())
continue;
if (token == "\\end_header")
break;
lyxerr[Debug::PARSER] << "Handling header token: `"
<< token << '\'' << endl;
string unknown = params.readToken(lex, token);
if (!unknown.empty()) {
if (unknown[0] != '\\') {
unknownClass(unknown);
} else {
++unknown_tokens;
}
}
}
return unknown_tokens;
}
// candidate for move to BufferView
// (at least some parts in the beginning of the func)
@ -300,11 +339,10 @@ vector<int> author_ids;
// if par = 0 normal behavior
// else insert behavior
// Returns false if "\the_end" is not read (Asger)
bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
bool Buffer::readBody(LyXLex & lex, Paragraph * par)
{
unknown_layouts = 0;
unknown_tokens = 0;
author_ids.clear();
int unknown_tokens = 0;
int pos = 0;
Paragraph::depth_type depth = 0;
@ -314,39 +352,61 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
LyXFont font(LyXFont::ALL_INHERIT, params.language);
if (!par) {
// New document
par = new Paragraph;
par->layout(params.getLyXTextClass().defaultLayout());
// mark the first paragraph
if (params.tracking_changes)
par->trackChanges();
unknown_tokens += readHeader(lex);
if (!params.getLyXTextClass().load()) {
#if USE_BOOST_FORMAT
Alert::alert(_("Textclass Loading Error!"),
boost::io::str(boost::format(_("Can't load textclass %1$s")) %
params.getLyXTextClass().name()),
_("-- substituting default."));
#else
Alert::alert(_("Textclass Loading Error!"),
_("Can't load textclass ")
+ params.getLyXTextClass().name(),
_("-- substituting default."));
#endif
params.textclass = 0;
}
} else {
// We are inserting into an existing document
users->text->breakParagraph(users, paragraphs);
first_par = users->text->ownerParagraph();
pos = 0;
markDirty();
// We don't want to adopt the parameters from the
// document we insert, so we skip until the text begins:
while (lex.isOK()) {
lex.nextToken();
string const pretoken = lex.getString();
if (pretoken == "\\layout") {
lex.pushToken(pretoken);
break;
}
}
// document we insert, so read them into a temporary buffer
// and then discard it
Buffer tmpbuf("", false);
tmpbuf.readHeader(lex);
}
while (lex.isOK()) {
lex.nextToken();
string const token = lex.getString();
if (token.empty()) continue;
if (token.empty())
continue;
lyxerr[Debug::PARSER] << "Handling token: `"
<< token << '\'' << endl;
the_end_read =
parseSingleLyXformat2Token(lex, par, first_par,
token, pos, depth,
font);
if (token == "\\the_end") {
the_end_read = true;
continue;
}
unknown_tokens += readToken(lex, par, first_par,
token, pos, depth, font);
}
if (!first_par)
@ -399,15 +459,15 @@ namespace {
};
bool
Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
int
Buffer::readToken(LyXLex & lex, Paragraph *& par,
Paragraph *& first_par,
string const & token, int & pos,
Paragraph::depth_type & depth,
LyXFont & font
)
{
bool the_end_read = false;
int unknown = 0;
// The order of the tags tested may seem unnatural, but this
// has been done in order to reduce the number of string
@ -518,9 +578,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
} else if (token == "\\end_inset") {
lyxerr << "Solitary \\end_inset in line " << lex.getLineNo() << "\n"
<< "Missing \\begin_inset?.\n"
<< "Last inset read was: " << last_inset_read
<< endl;
<< "Missing \\begin_inset?.\n";
// Simply ignore this. The insets do not have
// to read this.
// But insets should read it, it is a part of
@ -616,62 +674,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
}
else
--depth;
} else if (token == "\\begin_preamble") {
params.readPreamble(lex);
} else if (token == "\\textclass") {
lex.eatLine();
pair<bool, textclass_type> pp =
textclasslist.NumberOfClass(lex.getString());
if (pp.first) {
params.textclass = pp.second;
} else {
#if USE_BOOST_FORMAT
Alert::alert(_("Textclass error"),
boost::io::str(boost::format(_("The document uses an unknown textclass \"%1$s\".")) % lex.getString()),
_("-- substituting default."));
#else
Alert::alert(
_("Textclass error"),
_("The document uses an unknown textclass ")
+ lex.getString(),
_("-- substituting default."));
#endif
params.textclass = 0;
}
if (!params.getLyXTextClass().load()) {
// if the textclass wasn't loaded properly
// we need to either substitute another
// or stop loading the file.
// I can substitute but I don't see how I can
// stop loading... ideas?? ARRae980418
#if USE_BOOST_FORMAT
Alert::alert(_("Textclass Loading Error!"),
boost::io::str(boost::format(_("Can't load textclass %1$s")) %
params.getLyXTextClass().name()),
_("-- substituting default."));
#else
Alert::alert(_("Textclass Loading Error!"),
_("Can't load textclass ")
+ params.getLyXTextClass().name(),
_("-- substituting default."));
#endif
params.textclass = 0;
}
} else if (token == "\\options") {
lex.eatLine();
params.options = lex.getString();
} else if (token == "\\language") {
params.readLanguage(lex);
} else if (token == "\\fontencoding") {
lex.eatLine();
} else if (token == "\\inputencoding") {
lex.eatLine();
params.inputenc = lex.getString();
} else if (token == "\\graphics") {
params.readGraphicsDriver(lex);
} else if (token == "\\fontscheme") {
lex.eatLine();
params.fonts = lex.getString();
} else if (token == "\\noindent") {
par->params().noindent(true);
} else if (token == "\\leftindent") {
@ -692,219 +694,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
par->params().pagebreakBottom(true);
} else if (token == "\\start_of_appendix") {
par->params().startOfAppendix(true);
} else if (token == "\\paragraph_separation") {
int tmpret = lex.findToken(string_paragraph_separation);
if (tmpret == -1)
++tmpret;
params.paragraph_separation =
static_cast<BufferParams::PARSEP>(tmpret);
} else if (token == "\\defskip") {
lex.nextToken();
params.defskip = VSpace(lex.getString());
} else if (token == "\\quotes_language") {
int tmpret = lex.findToken(string_quotes_language);
if (tmpret == -1)
++tmpret;
InsetQuotes::quote_language tmpl =
InsetQuotes::EnglishQ;
switch (tmpret) {
case 0:
tmpl = InsetQuotes::EnglishQ;
break;
case 1:
tmpl = InsetQuotes::SwedishQ;
break;
case 2:
tmpl = InsetQuotes::GermanQ;
break;
case 3:
tmpl = InsetQuotes::PolishQ;
break;
case 4:
tmpl = InsetQuotes::FrenchQ;
break;
case 5:
tmpl = InsetQuotes::DanishQ;
break;
}
params.quotes_language = tmpl;
} else if (token == "\\quotes_times") {
lex.nextToken();
switch (lex.getInteger()) {
case 1:
params.quotes_times = InsetQuotes::SingleQ;
break;
case 2:
params.quotes_times = InsetQuotes::DoubleQ;
break;
}
} else if (token == "\\papersize") {
int tmpret = lex.findToken(string_papersize);
if (tmpret == -1)
++tmpret;
else
params.papersize2 = tmpret;
} else if (token == "\\paperpackage") {
int tmpret = lex.findToken(string_paperpackages);
if (tmpret == -1) {
++tmpret;
params.paperpackage = BufferParams::PACKAGE_NONE;
} else
params.paperpackage = tmpret;
} else if (token == "\\use_geometry") {
lex.nextToken();
params.use_geometry = lex.getInteger();
} else if (token == "\\use_amsmath") {
lex.nextToken();
params.use_amsmath = static_cast<BufferParams::AMS>(
lex.getInteger());
} else if (token == "\\use_natbib") {
lex.nextToken();
params.use_natbib = lex.getInteger();
} else if (token == "\\use_numerical_citations") {
lex.nextToken();
params.use_numerical_citations = lex.getInteger();
} else if (token == "\\tracking_changes") {
lex.nextToken();
params.tracking_changes = lex.getInteger();
// mark the first paragraph
if (params.tracking_changes)
par->trackChanges();
} else if (token == "\\author") {
lex.nextToken();
istringstream ss(lex.getString());
Author a;
ss >> a;
int aid(authorlist.record(a));
lyxerr << "aid is " << aid << endl;
lyxerr << "listed aid is " << author_ids.size() << endl;
author_ids.push_back(authorlist.record(a));
} else if (token == "\\paperorientation") {
int tmpret = lex.findToken(string_orientation);
if (tmpret == -1)
++tmpret;
params.orientation =
static_cast<BufferParams::PAPER_ORIENTATION>(tmpret);
} else if (token == "\\paperwidth") {
lex.next();
params.paperwidth = lex.getString();
} else if (token == "\\paperheight") {
lex.next();
params.paperheight = lex.getString();
} else if (token == "\\leftmargin") {
lex.next();
params.leftmargin = lex.getString();
} else if (token == "\\topmargin") {
lex.next();
params.topmargin = lex.getString();
} else if (token == "\\rightmargin") {
lex.next();
params.rightmargin = lex.getString();
} else if (token == "\\bottommargin") {
lex.next();
params.bottommargin = lex.getString();
} else if (token == "\\headheight") {
lex.next();
params.headheight = lex.getString();
} else if (token == "\\headsep") {
lex.next();
params.headsep = lex.getString();
} else if (token == "\\footskip") {
lex.next();
params.footskip = lex.getString();
} else if (token == "\\paperfontsize") {
lex.nextToken();
params.fontsize = rtrim(lex.getString());
} else if (token == "\\papercolumns") {
lex.nextToken();
params.columns = lex.getInteger();
} else if (token == "\\papersides") {
lex.nextToken();
switch (lex.getInteger()) {
default:
case 1: params.sides = LyXTextClass::OneSide; break;
case 2: params.sides = LyXTextClass::TwoSides; break;
}
} else if (token == "\\paperpagestyle") {
lex.nextToken();
params.pagestyle = rtrim(lex.getString());
} else if (token == "\\bullet") {
lex.nextToken();
int const index = lex.getInteger();
lex.nextToken();
int temp_int = lex.getInteger();
params.user_defined_bullets[index].setFont(temp_int);
params.temp_bullets[index].setFont(temp_int);
lex.nextToken();
temp_int = lex.getInteger();
params.user_defined_bullets[index].setCharacter(temp_int);
params.temp_bullets[index].setCharacter(temp_int);
lex.nextToken();
temp_int = lex.getInteger();
params.user_defined_bullets[index].setSize(temp_int);
params.temp_bullets[index].setSize(temp_int);
lex.nextToken();
string const temp_str = lex.getString();
if (temp_str != "\\end_bullet") {
// this element isn't really necessary for
// parsing but is easier for humans
// to understand bullets. Put it back and
// set a debug message?
lex.printError("\\end_bullet expected, got" + temp_str);
//how can I put it back?
}
} else if (token == "\\bulletLaTeX") {
// The bullet class should be able to read this.
lex.nextToken();
int const index = lex.getInteger();
lex.next();
string temp_str = lex.getString();
string sum_str;
while (temp_str != "\\end_bullet") {
// this loop structure is needed when user
// enters an empty string since the first
// thing returned will be the \\end_bullet
// OR
// if the LaTeX entry has spaces. Each element
// therefore needs to be read in turn
sum_str += temp_str;
lex.next();
temp_str = lex.getString();
}
params.user_defined_bullets[index].setText(sum_str);
params.temp_bullets[index].setText(sum_str);
} else if (token == "\\secnumdepth") {
lex.nextToken();
params.secnumdepth = lex.getInteger();
} else if (token == "\\tocdepth") {
lex.nextToken();
params.tocdepth = lex.getInteger();
} else if (token == "\\spacing") {
lex.next();
string const tmp = rtrim(lex.getString());
Spacing::Space tmp_space = Spacing::Default;
float tmp_val = 0.0;
if (tmp == "single") {
tmp_space = Spacing::Single;
} else if (tmp == "onehalf") {
tmp_space = Spacing::Onehalf;
} else if (tmp == "double") {
tmp_space = Spacing::Double;
} else if (tmp == "other") {
lex.next();
tmp_space = Spacing::Other;
tmp_val = lex.getFloat();
} else {
lex.printError("Unknown spacing token: '$$Token'");
}
// Small hack so that files written with klyx will be
// parsed correctly.
if (first_par) {
par->params().spacing(Spacing(tmp_space, tmp_val));
} else {
params.spacing.set(tmp_space, tmp_val);
}
} else if (token == "\\paragraph_spacing") {
lex.next();
string const tmp = rtrim(lex.getString());
@ -921,9 +710,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
} else {
lex.printError("Unknown spacing token: '$$Token'");
}
} else if (token == "\\float_placement") {
lex.nextToken();
params.float_placement = lex.getString();
} else if (token == "\\align") {
int tmpret = lex.findToken(string_align);
if (tmpret == -1)
@ -982,7 +768,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
lyx::time_type ct;
istr >> aid;
istr >> ct;
current_change = Change(Change::INSERTED, author_ids[aid], ct);
current_change = Change(Change::INSERTED, params.author_ids[aid], ct);
} else if (token == "\\change_deleted") {
lex.nextToken();
istringstream istr(lex.getString());
@ -990,12 +776,10 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
lyx::time_type ct;
istr >> aid;
istr >> ct;
current_change = Change(Change::DELETED, author_ids[aid], ct);
} else if (token == "\\the_end") {
the_end_read = true;
current_change = Change(Change::DELETED, params.author_ids[aid], ct);
} else {
// This should be insurance for the future: (Asger)
++unknown_tokens;
++unknown;
lex.eatLine();
#if USE_BOOST_FORMAT
boost::format fmt(_("Unknown token: %1$s %2$s\n"));
@ -1013,7 +797,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
}
return the_end_read;
return unknown;
}
@ -1089,7 +873,6 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
lex.next();
string const tmptok = lex.getString();
last_inset_read = tmptok;
// test the different insets
if (tmptok == "LatexCommand") {
@ -1263,7 +1046,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, Paragraph * par)
return false;
}
}
bool the_end = readLyXformat2(lex, par);
bool the_end = readBody(lex, par);
params.setPaperStuff();
if (!the_end) {
@ -1388,14 +1171,7 @@ bool Buffer::writeFile(string const & fname) const
// now write out the buffer paramters.
params.writeFile(ofs);
// if we're tracking, list all possible authors
if (params.tracking_changes) {
AuthorList::Authors::const_iterator it = authorlist.begin();
AuthorList::Authors::const_iterator end = authorlist.end();
for (; it != end; ++it) {
ofs << "\\author " << it->second << "\n";
}
}
ofs << "\\end_header\n";
Paragraph::depth_type depth = 0;

21
src/buffer.h
View File

@ -98,18 +98,22 @@ public:
*/
bool readFile(LyXLex &, string const &, Paragraph * par = 0);
/// read the header, returns number of unknown tokens
int readHeader(LyXLex & lex);
/** Reads a file without header.
\param par if != 0 insert the file.
\return \c false if file is not completely read.
*/
bool readLyXformat2(LyXLex &, Paragraph * par = 0);
bool readBody(LyXLex &, Paragraph * par = 0);
/// This parses a single token
int readToken(LyXLex &, Paragraph *& par,
Paragraph *& return_par,
string const & token, int & pos,
Paragraph::depth_type & depth,
LyXFont &);
/// This parses a single LyXformat-Token.
bool parseSingleLyXformat2Token(LyXLex &, Paragraph *& par,
Paragraph *& return_par,
string const & token, int & pos,
Paragraph::depth_type & depth,
LyXFont &);
///
void insertStringAsLines(Paragraph *&, lyx::pos_type &,
LyXFont const &, string const &);
@ -294,9 +298,6 @@ private:
/// need to regenerate .tex ?
DepClean dep_clean_;
/// the author list
AuthorList authorlist;
/// is save needed
mutable bool lyx_clean;

262
src/bufferparams.C
View File

@ -21,15 +21,19 @@
#include "lyxtextclasslist.h"
#include "lyxlex.h"
#include "Lsstream.h"
#include "author.h"
#include "support/lyxalgo.h" // for lyx::count
#include "support/lyxlib.h"
#include "support/lstrings.h"
#include "support/types.h"
#include <cstdlib>
#include <algorithm>
using std::ostream;
using std::endl;
using std::pair;
#ifdef WITH_WARNINGS
#warning Do we need this horrible thing? (JMarc)
@ -75,6 +79,256 @@ BufferParams::BufferParams()
}
string const BufferParams::readToken(LyXLex & lex, string const & token)
{
if (token == "\\textclass") {
lex.eatLine();
string const classname = lex.getString();
pair<bool, lyx::textclass_type> pp =
textclasslist.NumberOfClass(classname);
if (pp.first) {
textclass = pp.second;
} else {
textclass = 0;
return classname;
}
} else if (token == "\\begin_preamble") {
readPreamble(lex);
} else if (token == "\\options") {
lex.eatLine();
options = lex.getString();
} else if (token == "\\language") {
readLanguage(lex);
} else if (token == "\\inputencoding") {
lex.eatLine();
inputenc = lex.getString();
} else if (token == "\\graphics") {
readGraphicsDriver(lex);
} else if (token == "\\fontscheme") {
lex.eatLine();
fonts = lex.getString();
} else if (token == "\\paragraph_separation") {
int tmpret = lex.findToken(string_paragraph_separation);
if (tmpret == -1)
++tmpret;
paragraph_separation =
static_cast<BufferParams::PARSEP>(tmpret);
} else if (token == "\\defskip") {
lex.nextToken();
defskip = VSpace(lex.getString());
} else if (token == "\\quotes_language") {
// FIXME: should be params.readQuotes()
int tmpret = lex.findToken(string_quotes_language);
if (tmpret == -1)
++tmpret;
InsetQuotes::quote_language tmpl =
InsetQuotes::EnglishQ;
switch (tmpret) {
case 0:
tmpl = InsetQuotes::EnglishQ;
break;
case 1:
tmpl = InsetQuotes::SwedishQ;
break;
case 2:
tmpl = InsetQuotes::GermanQ;
break;
case 3:
tmpl = InsetQuotes::PolishQ;
break;
case 4:
tmpl = InsetQuotes::FrenchQ;
break;
case 5:
tmpl = InsetQuotes::DanishQ;
break;
}
quotes_language = tmpl;
} else if (token == "\\quotes_times") {
// FIXME: should be params.readQuotes()
lex.nextToken();
switch (lex.getInteger()) {
case 1:
quotes_times = InsetQuotes::SingleQ;
break;
case 2:
quotes_times = InsetQuotes::DoubleQ;
break;
}
} else if (token == "\\papersize") {
int tmpret = lex.findToken(string_papersize);
if (tmpret == -1)
++tmpret;
else
papersize2 = tmpret;
} else if (token == "\\paperpackage") {
int tmpret = lex.findToken(string_paperpackages);
if (tmpret == -1) {
++tmpret;
paperpackage = BufferParams::PACKAGE_NONE;
} else
paperpackage = tmpret;
} else if (token == "\\use_geometry") {
lex.nextToken();
use_geometry = lex.getInteger();
} else if (token == "\\use_amsmath") {
lex.nextToken();
use_amsmath = static_cast<BufferParams::AMS>(
lex.getInteger());
} else if (token == "\\use_natbib") {
lex.nextToken();
use_natbib = lex.getInteger();
} else if (token == "\\use_numerical_citations") {
lex.nextToken();
use_numerical_citations = lex.getInteger();
} else if (token == "\\tracking_changes") {
lex.nextToken();
tracking_changes = lex.getInteger();
} else if (token == "\\author") {
lex.nextToken();
istringstream ss(lex.getString());
Author a;
ss >> a;
int aid(authorlist.record(a));
author_ids.push_back(aid);
} else if (token == "\\paperorientation") {
int tmpret = lex.findToken(string_orientation);
if (tmpret == -1)
++tmpret;
orientation =
static_cast<BufferParams::PAPER_ORIENTATION>(tmpret);
} else if (token == "\\paperwidth") {
lex.next();
paperwidth = lex.getString();
} else if (token == "\\paperheight") {
lex.next();
paperheight = lex.getString();
} else if (token == "\\leftmargin") {
lex.next();
leftmargin = lex.getString();
} else if (token == "\\topmargin") {
lex.next();
topmargin = lex.getString();
} else if (token == "\\rightmargin") {
lex.next();
rightmargin = lex.getString();
} else if (token == "\\bottommargin") {
lex.next();
bottommargin = lex.getString();
} else if (token == "\\headheight") {
lex.next();
headheight = lex.getString();
} else if (token == "\\headsep") {
lex.next();
headsep = lex.getString();
} else if (token == "\\footskip") {
lex.next();
footskip = lex.getString();
} else if (token == "\\paperfontsize") {
lex.nextToken();
fontsize = rtrim(lex.getString());
} else if (token == "\\papercolumns") {
lex.nextToken();
columns = lex.getInteger();
} else if (token == "\\papersides") {
lex.nextToken();
switch (lex.getInteger()) {
default:
case 1: sides = LyXTextClass::OneSide; break;
case 2: sides = LyXTextClass::TwoSides; break;
}
} else if (token == "\\paperpagestyle") {
lex.nextToken();
pagestyle = rtrim(lex.getString());
} else if (token == "\\bullet") {
// FIXME: should be params.readBullets()
lex.nextToken();
int const index = lex.getInteger();
lex.nextToken();
int temp_int = lex.getInteger();
user_defined_bullets[index].setFont(temp_int);
temp_bullets[index].setFont(temp_int);
lex.nextToken();
temp_int = lex.getInteger();
user_defined_bullets[index].setCharacter(temp_int);
temp_bullets[index].setCharacter(temp_int);
lex.nextToken();
temp_int = lex.getInteger();
user_defined_bullets[index].setSize(temp_int);
temp_bullets[index].setSize(temp_int);
lex.nextToken();
string const temp_str = lex.getString();
if (temp_str != "\\end_bullet") {
// this element isn't really necessary for
// parsing but is easier for humans
// to understand bullets. Put it back and
// set a debug message?
lex.printError("\\end_bullet expected, got" + temp_str);
//how can I put it back?
}
} else if (token == "\\bulletLaTeX") {
// The bullet class should be able to read this.
lex.nextToken();
int const index = lex.getInteger();
lex.next();
string temp_str = lex.getString();
string sum_str;
while (temp_str != "\\end_bullet") {
// this loop structure is needed when user
// enters an empty string since the first
// thing returned will be the \\end_bullet
// OR
// if the LaTeX entry has spaces. Each element
// therefore needs to be read in turn
sum_str += temp_str;
lex.next();
temp_str = lex.getString();
}
user_defined_bullets[index].setText(sum_str);
temp_bullets[index].setText(sum_str);
} else if (token == "\\secnumdepth") {
lex.nextToken();
secnumdepth = lex.getInteger();
} else if (token == "\\tocdepth") {
lex.nextToken();
tocdepth = lex.getInteger();
} else if (token == "\\spacing") {
lex.next();
string const tmp = rtrim(lex.getString());
Spacing::Space tmp_space = Spacing::Default;
float tmp_val = 0.0;
if (tmp == "single") {
tmp_space = Spacing::Single;
} else if (tmp == "onehalf") {
tmp_space = Spacing::Onehalf;
} else if (tmp == "double") {
tmp_space = Spacing::Double;
} else if (tmp == "other") {
lex.next();
tmp_space = Spacing::Other;
tmp_val = lex.getFloat();
} else {
lex.printError("Unknown spacing token: '$$Token'");
}
#if 0 // FIXME: Handled in lyx2lyx ?
// Small hack so that files written with klyx will be
// parsed correctly.
if (first_par)
par->params().spacing(Spacing(tmp_space, tmp_val));
#endif
spacing.set(tmp_space, tmp_val);
} else if (token == "\\float_placement") {
lex.nextToken();
float_placement = lex.getString();
} else {
return token;
}
return string();
}
void BufferParams::writeFile(ostream & os) const
{
// The top of the file is written by the buffer.
@ -185,6 +439,14 @@ void BufferParams::writeFile(ostream & os) const
}
os << "\\tracking_changes " << tracking_changes << "\n";
if (tracking_changes) {
AuthorList::Authors::const_iterator it = authorlist.begin();
AuthorList::Authors::const_iterator end = authorlist.end();
for (; it != end; ++it) {
os << "\\author " << it->second << "\n";
}
}
}

10
src/bufferparams.h
View File

@ -19,6 +19,7 @@
#include "lyxtextclass.h"
#include "LaTeXFeatures.h"
#include "texrow.h"
#include "author.h"
#include "insets/insetquotes.h"
@ -108,6 +109,9 @@ public:
///
BufferParams();
/// read a header token, if unrecognised, return it or an unknown class name
string const readToken(LyXLex & lex, string const & token);
///
void writeFile(std::ostream &) const;
@ -228,6 +232,12 @@ public:
/// Time ago we agreed that this was a buffer property [ale990407]
string parentname;
private:
/// mapping of author IDs
std::vector<int> author_ids;
/// the author list
AuthorList authorlist;
///
friend class Buffer;
/** This is the amount of space used for paragraph_separation "skip",

3
src/insets/ChangeLog
View File

@ -1,3 +1,6 @@
2003-03-12 John Levon <levon@movementarian.org>
* insettext.C: name change to readToken()
2003-03-11 André Pönitz <poenitz@gmx.net>

8
src/insets/insettext.C
View File

@ -282,13 +282,13 @@ void InsetText::read(Buffer const * buf, LyXLex & lex)
Paragraph * tmp = &*(paragraphs.begin());
if (const_cast<Buffer*>(buf)->
parseSingleLyXformat2Token(lex, tmp, return_par,
token, pos, depth, font)) {
// the_end read this should NEVER happen
if (token == "\\the_end") {
lex.printError("\\the_end read in inset! Error in document!");
return;
}
const_cast<Buffer*>(buf)->readToken(lex, tmp, return_par,
token, pos, depth, font);
paragraphs.set(tmp);
}
if (!return_par)

2
src/lyxlex.C
View File

@ -140,7 +140,7 @@ string const LyXLex::getString() const
// I would prefer to give a tag number instead of an explicit token
// here, but it is not possible because Buffer::readLyXformat2 uses
// here, but it is not possible because Buffer::readBody uses
// explicit tokens (JMarc)
string const LyXLex::getLongString(string const & endtoken)
{

11
src/tabular.C
View File

@ -1470,14 +1470,15 @@ void LyXTabular::OldFormatRead(BufferParams const & bp,
lex.pushToken(token);
break;
}
if (owner_->bufferOwner()->parseSingleLyXformat2Token(lex, par,
return_par,
token, pos,
depth, font)) {
// the_end read
if (token == "\\the_end") {
lex.pushToken(token);
break;
}
owner_->bufferOwner()->readToken(lex, par, return_par,
token, pos, depth, font);
if (return_par) {
lex.printError("New Paragraph allocated! This should not happen!");
lex.pushToken(token);