diff --git a/lib/Makefile.am b/lib/Makefile.am index f63853f193..ac49a2da62 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -609,13 +609,6 @@ dist_images_DATA1X = \ images/layout.svgz \ images/layout-document.svgz \ images/layout-paragraph.svgz \ - images/layout_Description.svgz \ - images/layout_Enumerate.svgz \ - images/layout_Itemize.svgz \ - images/layout_List.svgz \ - images/layout_LyX-Code.svgz \ - images/layout_Chunk.svgz \ - images/layout_Section.svgz \ images/layout-toggle_Description.svgz \ images/layout-toggle_Enumerate.svgz \ images/layout-toggle_Itemize.svgz \ @@ -1897,13 +1890,6 @@ dist_imagesoxygen_DATA1X = \ images/oxygen/layout-document.svgz \ images/oxygen/layout-paragraph.svgz \ images/oxygen/layout.svgz \ - images/oxygen/layout_Chunk.svgz \ - images/oxygen/layout_Description.svgz \ - images/oxygen/layout_Enumerate.svgz \ - images/oxygen/layout_Itemize.svgz \ - images/oxygen/layout_List.svgz \ - images/oxygen/layout_LyX-Code.svgz \ - images/oxygen/layout_Section.svgz \ images/oxygen/layout-toggle_Chunk.svgz \ images/oxygen/layout-toggle_Description.svgz \ images/oxygen/layout-toggle_Enumerate.svgz \ @@ -2104,13 +2090,6 @@ dist_imagesclassic_DATA = \ images/classic/layout-document.png \ images/classic/layout-paragraph.png \ images/classic/layout.png \ - images/classic/layout_Description.png \ - images/classic/layout_Enumerate.png \ - images/classic/layout_Itemize.png \ - images/classic/layout_List.png \ - images/classic/layout_LyX-Code.png \ - images/classic/layout_Chunk.png \ - images/classic/layout_Section.png \ images/classic/layout-toggle_Description.png \ images/classic/layout-toggle_Enumerate.png \ images/classic/layout-toggle_Itemize.png \ diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index dcc87ac37b..264a5aa8e1 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -228,6 +228,7 @@ subequations \html_css_as_file 0 \html_be_strict false \author -563046850 "Jean-Marc LASGOUTTES" +\author 47243155 "Jean-Marc" \end_header \begin_body @@ -284,7 +285,13 @@ author: Uwe Stöhr \family sans -Version 2.3.x +Version 2. +\change_inserted 47243155 1563226038 +4 +\change_deleted 47243155 1563226038 +3 +\change_unchanged +.x \end_layout \begin_layout Standard @@ -4804,6 +4811,8 @@ arg "newline-insert newline" \begin_inset VSpace bigskip \end_inset + +\change_deleted 47243155 1563226130 The \change_deleted -563046850 1563190969 @@ -5369,7 +5378,13 @@ arraystretch \end_layout \begin_layout Standard -To set matrices into a text line, the command + +\change_inserted 47243155 1563226178 +Small inline matrices can also be obtained using +\change_deleted 47243155 1563226182 +To set matrices into a text line, +\change_unchanged + the command \series bold \backslash @@ -5387,7 +5402,11 @@ smallmatrix \end_inset - is used. + +\change_deleted 47243155 1563226186 + is used +\change_unchanged +. When it is inserted a blue box with two dashed lines appears. In this box the matrix is inserted. \end_layout @@ -5399,7 +5418,11 @@ C & D \end{smallmatrix}\right)$ \end_inset - in a text line. + in a text line +\change_inserted 47243155 1563226243 + with automatic delimiters around it +\change_unchanged +. \end_layout \begin_layout Section diff --git a/lib/images/classic/layout_Chunk.png b/lib/images/classic/layout_Chunk.png deleted file mode 100644 index 8b52e42afa..0000000000 Binary files a/lib/images/classic/layout_Chunk.png and /dev/null differ diff --git a/lib/images/classic/layout_Description.png b/lib/images/classic/layout_Description.png deleted file mode 100644 index c9305c57fb..0000000000 Binary files a/lib/images/classic/layout_Description.png and /dev/null differ diff --git a/lib/images/classic/layout_Enumerate.png b/lib/images/classic/layout_Enumerate.png deleted file mode 100644 index 8c63143b89..0000000000 Binary files a/lib/images/classic/layout_Enumerate.png and /dev/null differ diff --git a/lib/images/classic/layout_Itemize.png b/lib/images/classic/layout_Itemize.png deleted file mode 100644 index 92a67f092a..0000000000 Binary files a/lib/images/classic/layout_Itemize.png and /dev/null differ diff --git a/lib/images/classic/layout_List.png b/lib/images/classic/layout_List.png deleted file mode 100644 index 6875511aab..0000000000 Binary files a/lib/images/classic/layout_List.png and /dev/null differ diff --git a/lib/images/classic/layout_LyX-Code.png b/lib/images/classic/layout_LyX-Code.png deleted file mode 100644 index 7a5a60f3eb..0000000000 Binary files a/lib/images/classic/layout_LyX-Code.png and /dev/null differ diff --git a/lib/images/classic/layout_Section.png b/lib/images/classic/layout_Section.png deleted file mode 100644 index e17c0dd24b..0000000000 Binary files a/lib/images/classic/layout_Section.png and /dev/null differ diff --git a/lib/images/layout_Chunk.svgz b/lib/images/layout_Chunk.svgz deleted file mode 100644 index 2461c38046..0000000000 Binary files a/lib/images/layout_Chunk.svgz and /dev/null differ diff --git a/lib/images/layout_Description.svgz b/lib/images/layout_Description.svgz deleted file mode 100644 index 00cc0aa282..0000000000 Binary files a/lib/images/layout_Description.svgz and /dev/null differ diff --git a/lib/images/layout_Enumerate.svgz b/lib/images/layout_Enumerate.svgz deleted file mode 100644 index aaab67546a..0000000000 Binary files a/lib/images/layout_Enumerate.svgz and /dev/null differ diff --git a/lib/images/layout_Itemize.svgz b/lib/images/layout_Itemize.svgz deleted file mode 100644 index 53bde574fa..0000000000 Binary files a/lib/images/layout_Itemize.svgz and /dev/null differ diff --git a/lib/images/layout_List.svgz b/lib/images/layout_List.svgz deleted file mode 100644 index 5266ad5801..0000000000 Binary files a/lib/images/layout_List.svgz and /dev/null differ diff --git a/lib/images/layout_LyX-Code.svgz b/lib/images/layout_LyX-Code.svgz deleted file mode 100644 index 428a083bee..0000000000 Binary files a/lib/images/layout_LyX-Code.svgz and /dev/null differ diff --git a/lib/images/layout_Section.svgz b/lib/images/layout_Section.svgz deleted file mode 100644 index 65b4335fec..0000000000 Binary files a/lib/images/layout_Section.svgz and /dev/null differ diff --git a/lib/images/oxygen/layout_Chunk.svgz b/lib/images/oxygen/layout_Chunk.svgz deleted file mode 100644 index c8f1820494..0000000000 Binary files a/lib/images/oxygen/layout_Chunk.svgz and /dev/null differ diff --git a/lib/images/oxygen/layout_Description.svgz b/lib/images/oxygen/layout_Description.svgz deleted file mode 100644 index aa0ae3a816..0000000000 Binary files a/lib/images/oxygen/layout_Description.svgz and /dev/null differ diff --git a/lib/images/oxygen/layout_Enumerate.svgz b/lib/images/oxygen/layout_Enumerate.svgz deleted file mode 100644 index ad79d56820..0000000000 Binary files a/lib/images/oxygen/layout_Enumerate.svgz and /dev/null differ diff --git a/lib/images/oxygen/layout_Itemize.svgz b/lib/images/oxygen/layout_Itemize.svgz deleted file mode 100644 index bf45803ce7..0000000000 Binary files a/lib/images/oxygen/layout_Itemize.svgz and /dev/null differ diff --git a/lib/images/oxygen/layout_List.svgz b/lib/images/oxygen/layout_List.svgz deleted file mode 100644 index 036a6f9cfc..0000000000 Binary files a/lib/images/oxygen/layout_List.svgz and /dev/null differ diff --git a/lib/images/oxygen/layout_LyX-Code.svgz b/lib/images/oxygen/layout_LyX-Code.svgz deleted file mode 100644 index 376079c202..0000000000 Binary files a/lib/images/oxygen/layout_LyX-Code.svgz and /dev/null differ diff --git a/lib/images/oxygen/layout_Section.svgz b/lib/images/oxygen/layout_Section.svgz deleted file mode 100644 index 2e1468008a..0000000000 Binary files a/lib/images/oxygen/layout_Section.svgz and /dev/null differ diff --git a/po/postats.py b/po/postats.py index 52690967da..bca7380af9 100755 --- a/po/postats.py +++ b/po/postats.py @@ -38,6 +38,7 @@ ommitted = ('en.po') import os import sys import codecs +import subprocess from subprocess import Popen, PIPE # Reset the locale @@ -112,17 +113,14 @@ def run_msgfmt(pofile): prop["email"] = header['Last-Translator'].split('<')[1][:-1] prop["email"] = prop["email"].replace("@", " () ") prop["email"] = prop["email"].replace(".", " ! ") - translator = header['Last-Translator'].split('<')[0].strip() - try: - prop["translator"] = translator.encode('ascii','xmlcharrefreplace') - except LookupError: - prop["translator"] = translator + prop["translator"] = header['Last-Translator'].split('<')[0].strip() - P = Popen("msgfmt --statistics -o %s %s" % (gmofile, pofile), - shell=True, stdin=PIPE, stdout=PIPE, close_fds=True) - extract_number(P.stdout.readline().decode(), - ('translated', 'fuzzy', 'untranslated'), - prop) + msg = subprocess.check_output(["msgfmt", "--statistics", + "-o", gmofile, # FIXME: do we really want a gmofile as side-effect? + pofile], stderr=subprocess.STDOUT) + if sys.version_info[0] > 2: + msg = msg.decode('utf8') + extract_number(msg, ('translated', 'fuzzy', 'untranslated'), prop) return """ array ( 'langcode' => '%(langcode)s', "date" => "%(date)s", "msg_tr" => %(translated)d, "msg_fu" => %(fuzzy)d, "msg_nt" => %(untranslated)d, @@ -144,4 +142,6 @@ $branch_tag = "%s"; // The data itself $podata = array (%s -)?>""" % (sys.argv[1], branch_tag, ",".join([run_msgfmt(po) for po in sys.argv[2:] if po not in ommitted]))) +)?>""" % (sys.argv[1], branch_tag, + ",".join([run_msgfmt(po) for po in sys.argv[2:] + if po not in ommitted])))