anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Juergen Spitzmueller 2020-10-02 08:30:31 +02:00
parent 720179947e
commit 8b155ce957
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/tex2lyx/Preamble.cpp
View File

@ -469,6 +469,16 @@ void Preamble::add_package(string const & name, vector<string> & options)
}
}
void Preamble::setTextClass(string const tclass, TeX2LyXDocClass & tc)
{
h_textclass = tclass;
tc.setName(h_textclass);
if (!LayoutFileList::get().haveClass(h_textclass) || !tc.load()) {
cerr << "Error: Could not read layout file for textclass \"" << h_textclass << "\"." << endl;
exit(EXIT_FAILURE);
}
}
namespace {
@ -2164,12 +2174,7 @@ void Preamble::parse(Parser & p, string const & forceclass,
// Force textclass if the user wanted it
if (!forceclass.empty()) {
h_textclass = forceclass;
tc.setName(h_textclass);
if (!LayoutFileList::get().haveClass(h_textclass) || !tc.load()) {
cerr << "Error: Could not read layout file for textclass \"" << h_textclass << "\"." << endl;
exit(EXIT_FAILURE);
}
setTextClass(forceclass, tc);
class_set = true;
}
@ -2677,14 +2682,10 @@ void Preamble::parse(Parser & p, string const & forceclass,
// Only set text class if a class hasn't been forced
// (this was set above)
if (!class_set) {
h_textclass = tclass;
// textclass needs to be set at this place as we need to know
// it for other parameters (such as class-dependent paper size)
tc.setName(h_textclass);
if (!LayoutFileList::get().haveClass(h_textclass) || !tc.load()) {
cerr << "Error: Could not read layout file for textclass \"" << h_textclass << "\"." << endl;
exit(EXIT_FAILURE);
}
// textclass needs to be set at this place (if not already done)
// as we need to know it for other parameters
// (such as class-dependent paper size)
setTextClass(tclass, tc);
class_set = true;
}
@ -3109,14 +3110,9 @@ void Preamble::parse(Parser & p, string const & forceclass,
}
// set textclass if not yet done (snippets without \documentclass and forced class)
if (!class_set) {
tc.setName(h_textclass);
if (!LayoutFileList::get().haveClass(h_textclass) || !tc.load()) {
cerr << "Error: Could not read layout file for textclass \"" << h_textclass << "\"." << endl;
exit(EXIT_FAILURE);
}
}
if (!class_set)
setTextClass(h_textclass, tc);
// remove the whitespace
p.skip_spaces();

2
src/tex2lyx/Preamble.h
View File

@ -95,6 +95,8 @@ public:
void registerAuthor(std::string const & name, std::string const & initials);
/// Get author named \p name (must be registered first)
Author const & getAuthor(std::string const & name) const;
/// Set text class
void setTextClass(std::string const tclass, TeX2LyXDocClass & tc);
/// Get number of arguments of special table column type \c or -1
/// if no column type \p c exists
int getSpecialTableColumnArguments(char c) const;