379: Nothing to do (html output changes)
380: Nothing to do (empty lyx2lyx conversion)
381: Nothing to do (empty lyx2lyx conversion)
382: Activated already prepared notefontcolor code
383: Nothing to do (empty lyx2lyx conversion)
384: Nothing to do (empty lyx2lyx conversion)
385: Nothing to do (empty lyx2lyx conversion)
386: Nothing to do (empty lyx2lyx conversion)
387: Nothing to do (empty lyx2lyx conversion)
388: Nothing to do (empty lyx2lyx conversion)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39912
a592a061-630c-0410-9148-
cb99ea01b6c8
362 applemac encoding \encoding
363 horizontal longtable alignment InsetTabular
364 branch file name suffix \filename_suffix
362 applemac encoding \encoding
363 horizontal longtable alignment InsetTabular
364 branch file name suffix \filename_suffix
-365 custom paragraph indentation \paragraph_indentation
366 relative lengths for parskip \defskip
367 relative lengths for h and v space InsetHSpace, InsetVSpace
368 glue lengths InsetHSpace
366 relative lengths for parskip \defskip
367 relative lengths for h and v space InsetHSpace, InsetVSpace
368 glue lengths InsetHSpace
376 update .aux of unincluded children \maintain_unincluded_children
377 multirow.sty InsetTabular
378 revision info InsetInfo
376 update .aux of unincluded children \maintain_unincluded_children
377 multirow.sty InsetTabular
378 revision info InsetInfo
+380 ? InsetPreview
+381 \xymatrix@!{0,R,C} InsetMathXYMatrix
+382 note_fontcolor InsetNote
+384 document font color \fontcolor
+385 shaded box background color \boxbgcolor
+386 LyX version InsetInfo
+388 page sizes A0-3, A6, B0-3, B6, \papersize
+ JIS B0-6
namespace {
//add this to known_languages when updating to lyxformat 266:
namespace {
//add this to known_languages when updating to lyxformat 266:
+// "armenian" (needs special handling since not supported by standard babel)
//add these to known_languages when updating to lyxformat 268:
//"chinese-simplified", "chinese-traditional", "japanese", "korean"
// Both changes require first that support for non-babel languages (CJK,
//add these to known_languages when updating to lyxformat 268:
//"chinese-simplified", "chinese-traditional", "japanese", "korean"
// Both changes require first that support for non-babel languages (CJK,
// add turkmen for lyxformat 383
/**
* known babel language names (including synonyms)
// add turkmen for lyxformat 383
/**
* known babel language names (including synonyms)
- * not in standard babel: arabic, arabtex, belarusian, serbian-latin, thai
+ * not in standard babel: arabic, arabtex, armenian, belarusian, serbian-latin, thai
* not yet supported by LyX: kurmanji
* please keep this in sync with known_coded_languages line by line!
*/
* not yet supported by LyX: kurmanji
* please keep this in sync with known_coded_languages line by line!
*/
"ngerman", "ngermanb", "norsk", "nynorsk", "polutonikogreek", "polish",
"portuges", "portuguese", "romanian", "russian", "russianb", "samin",
"scottish", "serbian", "serbian-latin", "slovak", "slovene", "spanish",
"ngerman", "ngermanb", "norsk", "nynorsk", "polutonikogreek", "polish",
"portuges", "portuguese", "romanian", "russian", "russianb", "samin",
"scottish", "serbian", "serbian-latin", "slovak", "slovene", "spanish",
-"swedish", "thai", "turkish", "ukraineb", "ukrainian", "uppersorbian",
-"UKenglish", "USenglish", "usorbian", "vietnam", "welsh", 0};
+"swedish", "thai", "turkish", "turkmen", "ukraineb", "ukrainian",
+"uppersorbian", "UKenglish", "USenglish", "usorbian", "vietnam", "welsh",
+0};
/**
* the same as known_languages with .lyx names
/**
* the same as known_languages with .lyx names
"ngerman", "ngerman", "norsk", "nynorsk", "polutonikogreek", "polish",
"portuguese", "portuguese", "romanian", "russian", "russian", "samin",
"scottish", "serbian", "serbian-latin", "slovak", "slovene", "spanish",
"ngerman", "ngerman", "norsk", "nynorsk", "polutonikogreek", "polish",
"portuguese", "portuguese", "romanian", "russian", "russian", "samin",
"scottish", "serbian", "serbian-latin", "slovak", "slovene", "spanish",
-"swedish", "thai", "turkish", "ukrainian", "ukrainian", "uppersorbian",
-"uppersorbian", "english", "english", "vietnamese", "welsh", 0};
+"swedish", "thai", "turkish", "turkmen", "ukrainian", "ukrainian",
+"uppersorbian", "uppersorbian", "english", "english", "vietnamese", "welsh",
+0};
/// languages with english quotes (.lyx names)
const char * const known_english_quotes_languages[] = {"american", "bahasa",
"bahasam", "brazilian", "canadian", "chinese-simplified", "english",
"esperanto", "hebrew", "irish", "korean", "portuguese", "scottish", "thai", 0};
/// languages with english quotes (.lyx names)
const char * const known_english_quotes_languages[] = {"american", "bahasa",
"bahasam", "brazilian", "canadian", "chinese-simplified", "english",
"esperanto", "hebrew", "irish", "korean", "portuguese", "scottish", "thai", 0};
-//add this to known_french_quotes_languages when updating to
-//lyxformat 383: "turkmen"
/// languages with french quotes (.lyx names)
const char * const known_french_quotes_languages[] = {"albanian",
"arabic_arabi", "arabic_arabtex", "basque", "canadien", "catalan", "french",
"galician", "greek", "italian", "norsk", "nynorsk", "polutonikogreek",
/// languages with french quotes (.lyx names)
const char * const known_french_quotes_languages[] = {"albanian",
"arabic_arabi", "arabic_arabtex", "basque", "canadien", "catalan", "french",
"galician", "greek", "italian", "norsk", "nynorsk", "polutonikogreek",
-"russian", "spanish", "spanish-mexico", "turkish", "ukrainian", "vietnamese", 0};
+"russian", "spanish", "spanish-mexico", "turkish", "turkmen", "ukrainian",
+"vietnamese", 0};
/// languages with german quotes (.lyx names)
const char * const known_german_quotes_languages[] = {"austrian", "bulgarian",
/// languages with german quotes (.lyx names)
const char * const known_german_quotes_languages[] = {"austrian", "bulgarian",
string h_listings_params;
string h_tracking_changes = "false";
string h_output_changes = "false";
string h_listings_params;
string h_tracking_changes = "false";
string h_output_changes = "false";
+string h_html_math_output = "0";
+string h_html_be_strict = "false";
<< "\\cite_engine " << h_cite_engine << "\n"
<< "\\use_bibtopic " << h_use_bibtopic << "\n"
<< "\\paperorientation " << h_paperorientation << '\n';
<< "\\cite_engine " << h_cite_engine << "\n"
<< "\\use_bibtopic " << h_use_bibtopic << "\n"
<< "\\paperorientation " << h_paperorientation << '\n';
- if (LYX_FORMAT >= 382 && !h_notefontcolor.empty())
+ if (!h_notefontcolor.empty())
os << "\\notefontcolor " << h_notefontcolor << '\n';
os << h_margins
<< "\\secnumdepth " << h_secnumdepth << "\n"
<< "\\tocdepth " << h_tocdepth << "\n"
<< "\\paragraph_separation " << h_paragraph_separation << "\n";
os << "\\notefontcolor " << h_notefontcolor << '\n';
os << h_margins
<< "\\secnumdepth " << h_secnumdepth << "\n"
<< "\\tocdepth " << h_tocdepth << "\n"
<< "\\paragraph_separation " << h_paragraph_separation << "\n";
- if (LYX_FORMAT < 365 || h_paragraph_separation == "skip")
+ if (h_paragraph_separation == "skip")
os << "\\defskip " << h_defskip << "\n";
else
os << "\\paragraph_indentation " << h_paragraph_indentation << "\n";
os << "\\defskip " << h_defskip << "\n";
else
os << "\\paragraph_indentation " << h_paragraph_indentation << "\n";
os << "\\listings_params " << h_listings_params << "\n";
os << "\\tracking_changes " << h_tracking_changes << "\n"
<< "\\output_changes " << h_output_changes << "\n"
os << "\\listings_params " << h_listings_params << "\n";
os << "\\tracking_changes " << h_tracking_changes << "\n"
<< "\\output_changes " << h_output_changes << "\n"
+ << "\\html_math_output " << h_html_math_output << "\n"
+ << "\\html_be_strict " << h_html_be_strict << "\n"
<< "\\end_header\n\n"
<< "\\begin_body\n";
// clear preamble for subdocuments
<< "\\end_header\n\n"
<< "\\begin_body\n";
// clear preamble for subdocuments
if (name == "\\parindent" && content != "") {
if (content[0] == '0')
h_paragraph_separation = "skip";
if (name == "\\parindent" && content != "") {
if (content[0] == '0')
h_paragraph_separation = "skip";
- else if (LYX_FORMAT >= 365)
- h_paragraph_indentation = translate_len(content);
- h_preamble << "\\setlength{" << name
- << "}{" << content << "}";
+ h_paragraph_indentation = translate_len(content);
} else if (name == "\\parskip") {
if (content == "\\smallskipamount")
h_defskip = "smallskip";
} else if (name == "\\parskip") {
if (content == "\\smallskipamount")
h_defskip = "smallskip";
string const color = p.getArg('{', '}');
string const space = p.getArg('{', '}');
string const value = p.getArg('{', '}');
string const color = p.getArg('{', '}');
string const space = p.getArg('{', '}');
string const value = p.getArg('{', '}');
- if (LYX_FORMAT >= 382 &&
- color == "note_fontcolor" && space == "rgb") {
+ if (color == "note_fontcolor" && space == "rgb") {
RGBColor c(RGBColorFromLaTeX(value));
h_notefontcolor = X11hexname(c);
} else {
RGBColor c(RGBColorFromLaTeX(value));
h_notefontcolor = X11hexname(c);
} else {
/// Did we recognize any pdflatex-only construct?
extern bool pdflatex;
/// LyX format that is created by tex2lyx
/// Did we recognize any pdflatex-only construct?
extern bool pdflatex;
/// LyX format that is created by tex2lyx
-int const LYX_FORMAT = 378;
+int const LYX_FORMAT = 388;
/// path of the master .tex file
extern std::string getMasterFilePath();
/// path of the master .tex file
extern std::string getMasterFilePath();