static char const * const string_papersize[] = {
"default", "custom", "letterpaper", "legalpaper", "executivepaper",
- "a3paper", "a4paper", "a5paper", "b3paper", "b4paper", "b5paper", ""
+ "a0paper", "a1paper", "a2paper", "a3paper", "a4paper", "a5paper",
+ "a6paper", "b0paper", "b1paper", "b2paper","b3paper", "b4paper",
+ "b5paper", "b6paper", "b0j", "b1j", "b2j", "b3j", "b4j", "b5j",
+ "b6j", ""
};
translator.addPair(string_papersize[2], PAPER_USLETTER);
translator.addPair(string_papersize[3], PAPER_USLEGAL);
translator.addPair(string_papersize[4], PAPER_USEXECUTIVE);
- translator.addPair(string_papersize[5], PAPER_A3);
- translator.addPair(string_papersize[6], PAPER_A4);
- translator.addPair(string_papersize[7], PAPER_A5);
- translator.addPair(string_papersize[8], PAPER_B3);
- translator.addPair(string_papersize[9], PAPER_B4);
- translator.addPair(string_papersize[10], PAPER_B5);
+ translator.addPair(string_papersize[5], PAPER_A0);
+ translator.addPair(string_papersize[6], PAPER_A1);
+ translator.addPair(string_papersize[7], PAPER_A2);
+ translator.addPair(string_papersize[8], PAPER_A3);
+ translator.addPair(string_papersize[9], PAPER_A4);
+ translator.addPair(string_papersize[10], PAPER_A5);
+ translator.addPair(string_papersize[11], PAPER_A6);
+ translator.addPair(string_papersize[12], PAPER_B0);
+ translator.addPair(string_papersize[13], PAPER_B1);
+ translator.addPair(string_papersize[14], PAPER_B2);
+ translator.addPair(string_papersize[15], PAPER_B3);
+ translator.addPair(string_papersize[16], PAPER_B4);
+ translator.addPair(string_papersize[17], PAPER_B5);
+ translator.addPair(string_papersize[18], PAPER_B6);
+ translator.addPair(string_papersize[19], PAPER_JISB0);
+ translator.addPair(string_papersize[20], PAPER_JISB1);
+ translator.addPair(string_papersize[21], PAPER_JISB2);
+ translator.addPair(string_papersize[22], PAPER_JISB3);
+ translator.addPair(string_papersize[23], PAPER_JISB4);
+ translator.addPair(string_papersize[24], PAPER_JISB5);
+ translator.addPair(string_papersize[25], PAPER_JISB6);
return translator;
}
docstring desc =
translateIfPossible(from_utf8(baseClass()->description()));
docstring const msg =
- bformat(_("The document class requested\n"
+ bformat(_("The used document class\n"
"\t%1$s\n"
"requires external files that are not available.\n"
"The document class can still be used, but LyX\n"
clsoptions << fontsize << "pt,";
}
- // custom, A3, B3 and B4 paper sizes need geometry
- bool nonstandard_papersize = papersize == PAPER_B3
- || papersize == PAPER_B4
- || papersize == PAPER_A3
- || papersize == PAPER_CUSTOM;
+ // all paper sizes except of A4, A5, B5 and the US sizes need the
+ // geometry package
+ bool nonstandard_papersize = papersize != PAPER_DEFAULT
+ && papersize != PAPER_USLETTER
+ && papersize != PAPER_USLEGAL
+ && papersize != PAPER_USEXECUTIVE
+ && papersize != PAPER_A4
+ && papersize != PAPER_A5
+ && papersize != PAPER_B5;
if (!use_geometry) {
switch (papersize) {
clsoptions << "legalpaper,";
break;
case PAPER_DEFAULT:
+ case PAPER_A0:
+ case PAPER_A1:
+ case PAPER_A2:
case PAPER_A3:
+ case PAPER_A6:
+ case PAPER_B0:
+ case PAPER_B1:
+ case PAPER_B2:
case PAPER_B3:
case PAPER_B4:
+ case PAPER_B6:
+ case PAPER_JISB0:
+ case PAPER_JISB1:
+ case PAPER_JISB2:
+ case PAPER_JISB3:
+ case PAPER_JISB4:
+ case PAPER_JISB5:
+ case PAPER_JISB6:
case PAPER_CUSTOM:
break;
}
// LFE encoding
// XeTeX works without fontenc
if (font_encoding() != "default" && language->lang() != "japanese"
- && !useXetex) {
+ && !useXetex) {
+ size_t fars = language_options.str().find("farsi");
+ size_t arab = language_options.str().find("arabic");
if (language->lang() == "arabic_arabi"
- || language->lang() == "farsi") {
+ || language->lang() == "farsi" || fars != string::npos
+ || arab != string::npos) {
os << "\\usepackage[" << from_ascii(font_encoding())
<< ",LFE,LAE]{fontenc}\n";
texrow.newline();
case PAPER_USEXECUTIVE:
ods << ",executivepaper";
break;
+ case PAPER_A0:
+ ods << ",a0paper";
+ break;
+ case PAPER_A1:
+ ods << ",a1paper";
+ break;
+ case PAPER_A2:
+ ods << ",a2paper";
+ break;
case PAPER_A3:
ods << ",a3paper";
break;
case PAPER_A5:
ods << ",a5paper";
break;
+ case PAPER_A6:
+ ods << ",a6paper";
+ break;
+ case PAPER_B0:
+ ods << ",b0paper";
+ break;
+ case PAPER_B1:
+ ods << ",b1paper";
+ break;
+ case PAPER_B2:
+ ods << ",b2paper";
+ break;
case PAPER_B3:
ods << ",b3paper";
break;
case PAPER_B5:
ods << ",b5paper";
break;
+ case PAPER_B6:
+ ods << ",b6paper";
+ break;
+ case PAPER_JISB0:
+ ods << ",b0j";
+ break;
+ case PAPER_JISB1:
+ ods << ",b1j";
+ break;
+ case PAPER_JISB2:
+ ods << ",b2j";
+ break;
+ case PAPER_JISB3:
+ ods << ",b3j";
+ break;
+ case PAPER_JISB4:
+ ods << ",b4j";
+ break;
+ case PAPER_JISB5:
+ ods << ",b5j";
+ break;
+ case PAPER_JISB6:
+ ods << ",b6j";
+ break;
default:
// default papersize ie PAPER_DEFAULT
switch (lyxrc.default_papersize) {
case PAPER_B5:
ods << ",b5paper";
break;
+ case PAPER_A0:
+ case PAPER_A1:
+ case PAPER_A2:
+ case PAPER_A6:
+ case PAPER_B0:
+ case PAPER_B1:
+ case PAPER_B2:
case PAPER_B3:
case PAPER_B4:
+ case PAPER_B6:
+ case PAPER_JISB0:
+ case PAPER_JISB1:
+ case PAPER_JISB2:
+ case PAPER_JISB3:
+ case PAPER_JISB4:
+ case PAPER_JISB5:
+ case PAPER_JISB6:
case PAPER_CUSTOM:
break;
}
os << '[' << g_options << ']';
os << "{geometry}\n";
texrow.newline();
- os << "\\geometry{verbose";
- if (!topmargin.empty())
- os << ",tmargin=" << from_ascii(Length(topmargin).asLatexString());
- if (!bottommargin.empty())
- os << ",bmargin=" << from_ascii(Length(bottommargin).asLatexString());
- if (!leftmargin.empty())
- os << ",lmargin=" << from_ascii(Length(leftmargin).asLatexString());
- if (!rightmargin.empty())
- os << ",rmargin=" << from_ascii(Length(rightmargin).asLatexString());
- if (!headheight.empty())
- os << ",headheight=" << from_ascii(Length(headheight).asLatexString());
- if (!headsep.empty())
- os << ",headsep=" << from_ascii(Length(headsep).asLatexString());
- if (!footskip.empty())
- os << ",footskip=" << from_ascii(Length(footskip).asLatexString());
- if (!columnsep.empty())
- os << ",columnsep=" << from_ascii(Length(columnsep).asLatexString());
- os << "}\n";
- texrow.newline();
- } else if (orientation == ORIENTATION_LANDSCAPE) {
+ // output this if only use_geometry is true
+ if (use_geometry) {
+ os << "\\geometry{verbose";
+ if (!topmargin.empty())
+ os << ",tmargin=" << from_ascii(Length(topmargin).asLatexString());
+ if (!bottommargin.empty())
+ os << ",bmargin=" << from_ascii(Length(bottommargin).asLatexString());
+ if (!leftmargin.empty())
+ os << ",lmargin=" << from_ascii(Length(leftmargin).asLatexString());
+ if (!rightmargin.empty())
+ os << ",rmargin=" << from_ascii(Length(rightmargin).asLatexString());
+ if (!headheight.empty())
+ os << ",headheight=" << from_ascii(Length(headheight).asLatexString());
+ if (!headsep.empty())
+ os << ",headsep=" << from_ascii(Length(headsep).asLatexString());
+ if (!footskip.empty())
+ os << ",footskip=" << from_ascii(Length(footskip).asLatexString());
+ if (!columnsep.empty())
+ os << ",columnsep=" << from_ascii(Length(columnsep).asLatexString());
+ os << "}\n";
+ texrow.newline();
+ }
+ } else if (orientation == ORIENTATION_LANDSCAPE
+ || papersize != PAPER_DEFAULT) {
features.require("papersize");
}
}
return string();
}
+ case PAPER_A0:
+ // dvips and dvipdfm do not know this
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "a0";
+ case PAPER_A1:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "a1";
+ case PAPER_A2:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "a2";
case PAPER_A3:
return "a3";
case PAPER_A4:
return "a4";
case PAPER_A5:
return "a5";
+ case PAPER_A6:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "a6";
+ case PAPER_B0:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "b0";
+ case PAPER_B1:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "b1";
+ case PAPER_B2:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "b2";
case PAPER_B3:
- // dvips and dvipdfm do not know this
if (purpose == DVIPS || purpose == DVIPDFM)
return string();
return "b3";
return string();
return "b4";
case PAPER_B5:
- // dvipdfm does not know this
if (purpose == DVIPDFM)
return string();
return "b5";
+ case PAPER_B6:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "b6";
+ case PAPER_JISB0:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb0";
+ case PAPER_JISB1:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb1";
+ case PAPER_JISB2:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb2";
+ case PAPER_JISB3:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb3";
+ case PAPER_JISB4:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb4";
+ case PAPER_JISB5:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb5";
+ case PAPER_JISB6:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb6";
case PAPER_USEXECUTIVE:
// dvipdfm does not know this
if (purpose == DVIPDFM)
projects / lyx.git / blobdiff