Georg Baum [Sun, 29 Nov 2015 17:04:20 +0000 (18:04 +0100)]
Add utility to merge po files
Surprisingly I could not find a tool that merges updated translations into a
.po file in a way that
a) merges only missing translations (does not overwrite existing ones)
b) produces a minimal diff so that there is a chance to manually check the result
Therefore I wrote my own. You can use it for a single language
The python code is not the most elegant one, but it works. What is missing is
a command line switch to merge changed translations as well. This is useful
for languages that have not yet received any translation update in the
development branch, only in the stable branch: In this case we know that
translations that are not identical in both branches should be overtaken from
the stabkle one.
Georg Baum [Sun, 29 Nov 2015 12:26:50 +0000 (13:26 +0100)]
Fix mixed DOS/UNIX line endings
These have been added by 36d7b40c, before we had always UNIX only.
poedit can read the mixed files just fine, but python polib (which is used
in po/lyx_pot.py) refuses to load files with mixed endings.
Georg Baum [Sun, 29 Nov 2015 12:16:46 +0000 (13:16 +0100)]
Convert to 2.2 format and use TeX fonts
This works around a limitation of the test machinery, which never switches
TeX fonts on for format that need that, it only switches TeX fonts off for
formats needing it.
Georg Baum [Sat, 28 Nov 2015 16:00:59 +0000 (17:00 +0100)]
Add the first dedicated export test
Thanks to Kornel we do now have the infrastructure for running dedicated
export tests. This is the first one, showing a language nesting bug which is
already in 2.1. It is inverted for now, but this will hopefully change soon.
Uwe Stöhr [Thu, 26 Nov 2015 23:39:38 +0000 (00:39 +0100)]
installer: install Qt plugin DLLs correctly
- also remove support metafile2eps because:
- it is outdated
- unnecessary third-party program since ImageMagick can do this too
- needs unnecessarily installation time
Richard Heck [Wed, 25 Nov 2015 05:37:36 +0000 (00:37 -0500)]
Simplify lyx2lyx code a bit, and correct a mistake in my previous
patch. Also fix some escaping problems (\end instead of \\end).
My testing revealed some other problems with this routine: stray
\noindent tags popping up here and there. I don't have time to fix
it right now but will try to come back to it.
Georg Baum [Tue, 24 Nov 2015 19:31:14 +0000 (20:31 +0100)]
Fix C++11 std::regex incompatibility
boost::regex supports escape sequences starting with a backslash in format
strings of regex_replace, but std::regex does not. Therefore format strings
involving literal backslashes have to be written differently for both flavours.
The special MSVC handling in regex.h is removed, since it is not needed
anymore, and using grep syntax would definitely be wrong.
The computation of the legth of expanded hfills did not take into account their unexpanded size. This is done now by increasing the dimension (+=) instead of merely setting it.
Moreover, since the insets sizes are integer number, rounding effects have to be taken in account. To this end, the extra number of pixels is added to the last hfill in the row.
This fixes part of bug #9860.
Note not everything is fixed by this patch: the logic of ParagraphMetrics::hfillExpansion seems bogus to me. I do not see why consecutive hfills at the beginning of a row should not be all expanded. Since I do not know what are the peculiarities of hfill handling in LaTeX, I did not change it (yet).
I did not either try to investigate the label hfill part, because I do not even know what is so special about it. I think there is a lot of old logic that nobody ever tried to question.
Kornel Benko [Mon, 23 Nov 2015 12:07:53 +0000 (13:07 +0100)]
Cmake url tests: Added summary files.
The files will be locatet in the build-directory "Testing/Temporary" as
LastFailedAccessibleURLS.log
LastFailedInaccessibleURLS.log
LastFailedKnownInvalidURLS.log
Georg Baum [Sun, 22 Nov 2015 16:43:10 +0000 (17:43 +0100)]
Fix InsetListings::getCaption() for std::regex
Back references in the format string of regex_replace use the syntax $n both
in std::regex and in boost::regex for the default format. Boost seems to
support the syntax \n in addition, but it is not documented at
http://www.boost.org/doc/libs/master/libs/regex/doc/html/boost_regex/format.html.
Therefore it is a good idea to use $n also for boost.
Kornel Benko [Sun, 22 Nov 2015 12:44:27 +0000 (13:44 +0100)]
Cmake export tests: Created sub-labels manuals, examples, templates, mathmacros, autotests.
To test all export use 'ctest -L export'. This is unchanged.
The following lists directories and assigned sub-label
lib/doc: manuals
lib/templates: templates
lib/examples: examples
development/mathmacro: mathmacros
autotests: autotests
Georg Baum [Sun, 22 Nov 2015 12:02:39 +0000 (13:02 +0100)]
Fix some thinkos in MSVC regex hack
The changed code is not used, but I tried to use a similar approach for
boost::regex, and found some problems:
- regex_replace and regex_search are implemented in the replacement, so they
must not be used directly
- an smatch object must be given by reference (as in the called methods),
otherwise an exception would be thrown at runtime
- the commented out regex_replace version is actually needed
This code is supposed to be deleted, but nevertheless I wanted to record here
how it had to be modified if it was actually needed.