Compare commits

..

No commits in common. "77e4092b99e79c68edb055c006062de9f4420ceb" and "f5306b7054acc903fe0946f12d45cf61cedad7f1" have entirely different histories.

4 changed files with 2 additions and 11 deletions

View File

@ -283,11 +283,6 @@ if (extension MATCHES "\\.lyx$")
COMMAND ${lyx} -userdir "${LYX_TESTS_USERDIR}" -E ${_texformat} ${used_tex_file} "${LYX_SOURCE}"
RESULT_VARIABLE _errx)
endif()
if(_errx)
set(_err -1)
Summary(_err "Exporting ${LYX_SOURCE} to format ${_texformat} failed")
break()
endif()
endif()
endif()
get_md5sum(result_file_name result_md5sum _err)

View File

@ -53,10 +53,6 @@ export/export/lyx2lyx/lyx_2_3_test_lyx(16|20|21|22)
# Additional empty lines (vs. Separator latexpar) with every round-trip
# before an ERT nested in a Description list:
export/export/lyx2lyx/lyx_2_3_test2_lyx(16|20)
# Gives error when exporting to TeX. These are old formats, so it is not
# clear it is worth the time to try to fix the issue.
export/doc/ja/UserGuide_lyx(16|20)
export/examples/ja/Modules/LilyPond_Book_lyx(16|20)
# nonstandard tests failing for unknown reason:
export/templates/Articles/R_Journal_(dvi3|pdf[45])_systemF

View File

@ -30,7 +30,7 @@ if (defined($useNonTexFonts) && defined($outputFormat)) {
if ($useNonTexFonts) {
if ($outputFormat eq "default") {
if ($language eq "japanese") {
$outputFormat = "pdf4";
$outputFormat = "pdf3";
}
else {
$outputFormat = "pdf5";

View File

@ -72,8 +72,8 @@ void Statistics::update(Text const & text)
void Statistics::update(CursorSlice const & from, CursorSlice & to)
{
LASSERT(from.text() == to.text(), return);
if (from.idx() == to.idx()) {
LASSERT(from.text() == to.text(), return);
if (from.pit() == to.pit()) {
update(from.paragraph(), from.pos(), to.pos());
} else {