]>
git.lyx.org Git - lyx.git/log
Richard Kimberly Heck [Wed, 12 Dec 2018 06:37:00 +0000 (01:37 -0500)]
There is no reason we should need to reload the bibinfo cache for
internal buffers.
Richard Kimberly Heck [Wed, 12 Dec 2018 06:18:16 +0000 (01:18 -0500)]
Fix slowness problem reported on the mailing list on Windows.
https://marc.info/?l=lyx-devel&m=
154458979925296 &w=2
This is related to the fix for #9158 and the caching of bibfile
information. On Windows, it is incredibly slow to run kpsewhich,
which we do to check where files actually are, so as to get info
about them (e.g., timestamps). So we have started to cache that
as a map. The map is supposed to be invalidated when various
things happen, but an oversight was causing it to be invalidated
on every cut operation. This is because cutting uses a temporary
Buffer, and the operations on it were affecting the *global* cache
of biblio file info. (It makes sense to have a global cache, since
these files are not document-specific.) Basically, we have to update
the list of bibfiles in that temporary Buffer---but that is one of
the things that invalidated the cache. The solution is only to
invalidate the cache if the list of bibfiles has actually changed
(a sensible idea anyway). The only time that will happen in the
temporary Buffer is when the copied information contains a BibTeX
inset. That should be fairly rare.
Enrico Forestieri [Thu, 13 Dec 2018 18:39:23 +0000 (19:39 +0100)]
Fix display of single-char macro names
Essentially, all characters are allowed in single-char macro names.
Part of #11158.
(cherry picked from commit
95bc273a597401f3ca9a43ed5d2d5db5626ae819 )
Guillaume MM [Tue, 13 Nov 2018 22:10:35 +0000 (23:10 +0100)]
Fix segfault after deleting monitor
The boost signal was sent synchronously, and so made the Qt signal to be posted
in FileMonitor::changed after the boost signal returned, so after the sender was
possibly destroyed.
The solution is to make the boost signal asynchronous using the Qt event loop.
Thanks to Scott Kostyshak for the report and MWE.
(cherry picked from commit
131f4b92bac3ecb75b47c266dfa3d8543bd4d578 )
Jean-Marc Lasgouttes [Sat, 3 Nov 2018 15:55:33 +0000 (15:55 +0000)]
Fix selection of unmarked RtL text
With Qt 5.11 at least, RtL text will be drawn RtL even when the
(undocumented) flag Qt::TextForceLeftToRight is applied to the
QTextLayout object. This creates selection issues for Hebrew text
marked as English.
The solution is to do the same as in breakAt_helper, that is prepend
the string with a direction override unicode character.
Doing this requires to introduce a TEXTLAYOUT_OFFSET constant that has
to be used wisely to account for this extra character.
Fixes bug #11284.
(cherry picked from commit
1bed76e2a1057ab2f3f33f01ec23956653265d4a )
Jean-Marc Lasgouttes [Sat, 3 Nov 2018 14:29:10 +0000 (14:29 +0000)]
Remove old workaround that is not needed anymore
This causes a compilation error with boost 1.69.
Fixes bug #11349.
(cherry picked from commit
76e99e9a20cf635d20effa597551f3a9af484465 )
Juergen Spitzmueller [Sun, 27 May 2018 09:54:07 +0000 (11:54 +0200)]
Fix encoding problems in \input@path
As of LaTeX2e 2018, characters are made active earlier, which results
in new expansion problems.
Following a suggestion of Markus Kohm (pc) and the TL mailing list [1],
we embrace non-ASCII input paths in \detokenize. This relies on e-tex,
but I think we can assume this is nowadays available everywhere.
[1] http://tug.org/pipermail/tex-live/2018-May/041691.html
Fixes: #11146
(cherry picked from commit
8bd65041f2e22bf4c37219c7008a7e4e2bda2799 )
Richard Kimberly Heck [Fri, 4 May 2018 16:37:52 +0000 (12:37 -0400)]
Copy modules into the Advanced F&R pane as well.
(cherry picked from commit
5064c09e9f57a7ffb6082a7f8ec06c03ee9a0cef )
Update the Advanced F&R document class when switching buffers.
(cherry picked from commit
944b0ae55dd89e48bf8845c6d5e08a73bd1c4917 )
Richard Kimberly Heck [Sun, 22 Jul 2018 02:49:49 +0000 (22:49 -0400)]
Speed up convert_literalparam. Part of #11200.
(cherry picked from commit
4549f46a431021d6667451ab83965eca12d58f58 )
Richard Kimberly Heck [Tue, 17 Jul 2018 02:14:40 +0000 (22:14 -0400)]
Speed up convert_specialchars. Part of #11200.
(cherry picked from commit
96ea84e04202325b2407c5eb6923aad49535b522 )
Richard Kimberly Heck [Tue, 17 Jul 2018 02:14:36 +0000 (22:14 -0400)]
Speed up convert_captionlayouts. Part of #11200.
(cherry picked from commit
4cb209b121430b38606932e31d2659bd7ed57447 )
Guillaume Munch [Thu, 4 Oct 2018 23:52:21 +0000 (19:52 -0400)]
Make tab movement visible (#10733)
The nice hand-made solution for moving tabs has made its time. Use Qt's feature
instead from now on.
(cherry picked from commit
19794963990f13aaae2cd575b2f445585ec82910 )
Richard Heck [Sat, 7 Apr 2018 02:29:04 +0000 (22:29 -0400)]
Fix bug 9798.
Nameref support for math references.
(cherry picked from commit
5f6332bf46d4a0b65dd352b3e12ec35f58b6dece )
Richard Heck [Mon, 2 Apr 2018 02:40:00 +0000 (22:40 -0400)]
Fix bug #7404.
This allows for external editing of ERT insets. Original patch
by Georg Baum. Updated to 2.4dev by Riki Heck.
(cherry picked from commit
f17f5617e05ea8a7f179586cc16c5bb05a0e9e2d )
Richard Heck [Fri, 20 Apr 2018 03:33:40 +0000 (23:33 -0400)]
Fix bug #991.
Patch adapts Georg's work on #7404 to this case.
(cherry picked from commit
3847e0ef7726afc41e6ed69f625d36153ccccc33 )
Enrico Forestieri [Fri, 16 Nov 2018 20:47:24 +0000 (21:47 +0100)]
Fix reloading of local layout file (bug #11120)
(cherry picked from commit
7822d11361b270ea0e96c02a0e43e0bdd7cee07d )
Kornel Benko [Tue, 11 Dec 2018 11:12:02 +0000 (12:12 +0100)]
Fix #11241, FindAdv for wedge in subscript
Patch from ajd, completed to include also latexifyFromCursor()
Richard Kimberly Heck [Tue, 11 Dec 2018 04:35:28 +0000 (23:35 -0500)]
Back to development.
Richard Kimberly Heck [Sun, 9 Dec 2018 20:47:47 +0000 (15:47 -0500)]
Need to include these in the tarball.
Richard Kimberly Heck [Sat, 8 Dec 2018 16:38:07 +0000 (11:38 -0500)]
Remove lyx-bundle.nsi.
Richard Kimberly Heck [Sun, 9 Dec 2018 21:11:51 +0000 (16:11 -0500)]
File starting to document the Windows dependencies.
Richard Kimberly Heck [Sun, 9 Dec 2018 21:08:44 +0000 (16:08 -0500)]
Remove unnecessary file.
Richard Kimberly Heck [Sun, 9 Dec 2018 20:50:19 +0000 (15:50 -0500)]
Build 2.3.2 for Windows.
Enrico Forestieri [Thu, 6 Dec 2018 09:30:58 +0000 (10:30 +0100)]
Amend
bd21aa9
Check whether a line is actually blank rather than whether
we are at the beginning of a line.
(cherry picked from commit
976e0b79933e162070ef3d2973fb0c899f8bdf54 )
Enrico Forestieri [Sun, 2 Dec 2018 17:27:38 +0000 (18:27 +0100)]
Fix bug #11398
When deciding how to strike out deleted math in change-tracking
mode, differentiate only on begin-of-line or not, and not on
after-paragraph-break or not.
The assumption that a new paragraph is always started after a
float seems to be not true and was causing this bug.
(cherry picked from commit
bd21aa99d244cbfe532c4d970197a940355828dd )
Richard Kimberly Heck [Sat, 8 Dec 2018 16:25:37 +0000 (11:25 -0500)]
Remerge strings.
Richard Kimberly Heck [Sat, 8 Dec 2018 16:24:40 +0000 (11:24 -0500)]
Prepare for 2.3.2.
Richard Kimberly Heck [Sun, 30 Sep 2018 17:51:30 +0000 (13:51 -0400)]
Revert "Revert "Check for old "LyX 2.3" user directory when configuring.""
This reverts commit
b66cf5aecd04518243d90058c6243b9cd90eebce .
Pavel Sanda [Sun, 2 Dec 2018 02:28:53 +0000 (03:28 +0100)]
* cs.po
Pavel Sanda [Sun, 2 Dec 2018 01:08:49 +0000 (02:08 +0100)]
Correctly update after buffer-anonymize in branch.
In master the screen update after buffer-anonymize happens without screenUpdate.
Richard Kimberly Heck [Thu, 29 Nov 2018 23:05:09 +0000 (18:05 -0500)]
gmo file update
Richard Kimberly Heck [Thu, 29 Nov 2018 23:02:36 +0000 (18:02 -0500)]
Hungarian translation update.
Richard Kimberly Heck [Thu, 29 Nov 2018 23:02:25 +0000 (18:02 -0500)]
Typo
Juergen Spitzmueller [Sun, 25 Nov 2018 10:51:11 +0000 (11:51 +0100)]
sv.po: update by Jim.
Jean-Marc Lasgouttes [Wed, 21 Nov 2018 12:49:20 +0000 (13:49 +0100)]
Show cursor correctly when loading file
This is a fixup to
4ecbff00 . When a file is loaded and the cursor is
set, it is required to first compute metrics to be able to scroll the
screen correctly.
Fixes bug #11377.
(cherry picked from commit
2dc84b69d5a040e6343e21606f1c16a7c0957383 )
Pavel Sanda [Fri, 23 Nov 2018 00:03:36 +0000 (01:03 +0100)]
* cs.po
Jean-Marc Lasgouttes [Sun, 4 Nov 2018 23:53:36 +0000 (13:53 -1000)]
Avoid extra space in tooltips
When using QTextDocument to check the natutal size of a text, one has
to remove the text margin, which is not useful here.
Fixes bug #11353.
(cherry picked from commit
7db99672e6838535d837096ab2344e7ecedb47e3 )
Pavel Sanda [Mon, 19 Nov 2018 23:01:50 +0000 (00:01 +0100)]
* cs.po
Juergen Spitzmueller [Sun, 18 Nov 2018 17:22:08 +0000 (18:22 +0100)]
pt_BR.po: update by Georger
Juergen Spitzmueller [Thu, 15 Nov 2018 14:51:43 +0000 (15:51 +0100)]
ru.po: yet another update by Yuriy
Juergen Spitzmueller [Wed, 14 Nov 2018 15:19:40 +0000 (16:19 +0100)]
uk.po: update by Yuri
Juergen Spitzmueller [Wed, 14 Nov 2018 15:18:55 +0000 (16:18 +0100)]
ru.po: update by Yuriy
Pavel Sanda [Tue, 13 Nov 2018 23:04:21 +0000 (00:04 +0100)]
* cs.po
Enrico Forestieri [Mon, 12 Nov 2018 20:16:14 +0000 (21:16 +0100)]
Fix bug #11367
The overset, underset, and stackrel insets behave like the script
rather than the fraction inset.
Richard Kimberly Heck [Mon, 12 Nov 2018 19:27:49 +0000 (14:27 -0500)]
Remerge strings.
Pavel Sanda [Wed, 7 Nov 2018 13:37:48 +0000 (14:37 +0100)]
* cs.po
Kornel Benko [Tue, 30 Oct 2018 22:14:35 +0000 (23:14 +0100)]
Update sk.po
Juergen Spitzmueller [Tue, 30 Oct 2018 16:23:08 +0000 (17:23 +0100)]
Dispay pre- and posttext widgets if non-empty also if unapplied
Fixes: #11352
(cherry picked from commit
b8932afed543421defde7b46e4102a82b4faabe4 )
Jean-Marc Lasgouttes [Mon, 22 Oct 2018 13:29:08 +0000 (15:29 +0200)]
Amend
4ecbff00 : it is too early for skipping the updateMacros call
(cherry picked from commit
9e7832915f9763510e5820167930a38e16a8321f )
Enrico Forestieri [Mon, 15 Oct 2018 17:32:59 +0000 (19:32 +0200)]
Update it.po
Juergen Spitzmueller [Mon, 15 Oct 2018 06:04:31 +0000 (08:04 +0200)]
Missing backports in the context of #9158
This fixes the remaining regressions in stable with citation
jpc [Sun, 14 Oct 2018 09:40:28 +0000 (11:40 +0200)]
Update fr.po
Juergen Spitzmueller [Sat, 13 Oct 2018 11:51:00 +0000 (13:51 +0200)]
Amend
a754912 once more
Do not use LTR environment (bidi) at all, since it adds unwanted
paragraph breaks.
Fixes: #11338
(cherry picked from commit
3a91fed26941e2599b5cb5f2924225a73a98f246 )
Juergen Spitzmueller [Sat, 13 Oct 2018 09:06:24 +0000 (11:06 +0200)]
Clear bibfile cache when set of bibliography files change
Part of #9158
(cherry picked from commit
4115d2487f57f58774ee2846aa2b35818c0bc1b9 )
Juergen Spitzmueller [Fri, 11 May 2018 11:17:39 +0000 (13:17 +0200)]
Merge paragraphs when pasted into an inset that forbids multipars
Fixes: #8281
(cherry picked from commit
5dde4b1b3e69f132e2f27116cde377f80adb5ea3 )
Juergen Spitzmueller [Tue, 9 Oct 2018 08:42:38 +0000 (10:42 +0200)]
Load covington later
This solves a loading order conflict with beamer-article.
(cherry picked from commit
00ee54e6949505cbda7f6a287d2f69f1a6b37a86 )
Enrico Forestieri [Wed, 10 Oct 2018 17:41:31 +0000 (19:41 +0200)]
Fix bug #11332
Add the "hyperref-driver=dvips" option to the extra flags of the
latex->dvi converter so that the breakurl package is automatically
loaded when needed.
(cherry picked from commit
f5e6db717167ecbe9e5934c937467bf0fca90ba1 )
Juergen Spitzmueller [Tue, 9 Oct 2018 16:04:51 +0000 (18:04 +0200)]
Amend
a754912
Switch logic, since isStyle() does not cover inline math
Fixes: #11338
(cherry picked from commit
9d8fbc7fd15bd097771aa3e34631ea6315a7d54e )
Richard Kimberly Heck [Mon, 8 Oct 2018 20:27:47 +0000 (16:27 -0400)]
Revert "Fix bug #9348"
The fix changes behavior too much for stable. My bad.
This reverts commit
e94ea46be7e6738ff7ebdaca995c076a6fe649ef .
Juergen Spitzmueller [Mon, 8 Oct 2018 10:19:15 +0000 (12:19 +0200)]
de.po
Juergen Spitzmueller [Sat, 28 Apr 2018 09:19:26 +0000 (11:19 +0200)]
Rework OK/Apply/Cancel UI of prefs dialog
Instead of "Save" (permanently) and "Apply" (temporarily), OK and Apply
now always save permanently, unless the new checkbox "Apply to current
session only" is checked.
Addresses: #10016
(cherry picked from commit
c7bdb3b342823d3144f3c73e125e274aa40c77e2 )
Juergen Spitzmueller [Fri, 1 Jun 2018 08:17:18 +0000 (10:17 +0200)]
If a master is being created at loading the child, un-hide it.
Fixes: #11162
(cherry picked from commit
a368439bcc3fbd18b4635d1b7c12da08b9315e2c )
Juergen Spitzmueller [Thu, 6 Sep 2018 12:46:44 +0000 (14:46 +0200)]
Fix suprious comma in book and thesis bib preview.
Fixes: #11272
(cherry picked from commit
399a4d7e718f7e6e88f6110aa1fd3d933ab59887 )
Juergen Spitzmueller [Sat, 22 Sep 2018 08:37:22 +0000 (10:37 +0200)]
GuiCitation: don't reset filter on show
Addresses #11291
(cherry picked from commit
33d6499bbc98fe0efd8e271049cb22944ffbf71c )
Juergen Spitzmueller [Mon, 8 Oct 2018 09:32:30 +0000 (11:32 +0200)]
Fix indentation
Enrico Forestieri [Tue, 10 Apr 2018 20:40:02 +0000 (22:40 +0200)]
Fix bug #9348
(cherry picked from commit
503f7db224c7afaa82ce1f0aea538bd2af0cf31a )
Richard Kimberly Heck [Fri, 5 Oct 2018 15:46:51 +0000 (11:46 -0400)]
Minor status updates
Richard Kimberly Heck [Mon, 9 Jul 2018 01:38:00 +0000 (21:38 -0400)]
Fix bug #10177.
The left margin given at class level should apply only to the main text.
(cherry picked from commit
a007b65202cbc103e3e7868dcde3e754bfcd276d )
Kornel Benko [Thu, 4 Oct 2018 21:04:30 +0000 (23:04 +0200)]
Update sk.po
Richard Kimberly Heck [Thu, 4 Oct 2018 18:02:01 +0000 (14:02 -0400)]
Fix bug #11275.
Show module name with description.
(cherry picked from commit
2553b0073f5f63b7e8629154a810ffb7eaa6c366 )
Jean-Marc Lasgouttes [Wed, 3 Oct 2018 13:57:11 +0000 (15:57 +0200)]
When ignoring an update, request one for later
If we were not ready to paint the screen, this does not mean that we
should give up on repainting, just potpone it.
I thought that it was bad to call update() in the paint event, but I
cannot find reference to this anymore and everything seems to work as
intended.
Fixes part of bug #11323.
(cherry picked from commit
38f09c177b7da08f852e13c9a50fd2e8098b7491 )
(cherry picked from commit
2617a4dd501c64048573e2d9c4e6fb9f423a1067 )
Enrico Forestieri [Sun, 24 Jun 2018 18:06:40 +0000 (20:06 +0200)]
Fix bug #11180
When a raster image with an advertised pixel density different
from 72 dpi is included in a latex file, the output image dimensions
are scaled by the ratio 72/pixel_density. Hence, if a clipping
bounding box is specified, it has to be scaled by the same ratio,
otherwise the images will be clipped differently on screen and output.
Here we use the extractbb command (present in any TeX distribution)
to ask about the output dimensions of the image as dictated by the
pixel density and compute the scaling ratio by the knowledge of the
actual dimensions. If, for whatever reason, extractbb is not found,
everything goes as before, because the clipping bounding box will
simply not be corrected.
(cherry picked from commit
380f34a11485c41d812695dc4279b24a5ed5cc07 )
Richard Kimberly Heck [Thu, 3 May 2018 04:05:21 +0000 (00:05 -0400)]
Do not step equation numbers in deleted equations.
(cherry picked from commit
df5805917be108b0cce8b502f7b6906f59b0e2ea )
Richard Kimberly Heck [Thu, 3 May 2018 03:56:41 +0000 (23:56 -0400)]
Do not step counters in deleted material.
Also, display the counter as "#" if the inset is deleted.
(cherry picked from commit
200064e9a40f5ecfe6b7e5b361d31be3eba5ce92 )
Richard Heck [Sat, 7 Apr 2018 01:31:11 +0000 (21:31 -0400)]
Fix bug 11070.
Allows plural, caps, no prefix to be set via context menu.
(cherry picked from commit
35afcfb6dd4fe9519cb132c55714c73be981b275 )
Pavel Sanda [Wed, 3 Oct 2018 21:27:25 +0000 (23:27 +0200)]
update LFUNs.lyx
Pavel Sanda [Wed, 3 Oct 2018 21:21:57 +0000 (23:21 +0200)]
* cs.po
Kornel Benko [Wed, 3 Oct 2018 08:06:22 +0000 (10:06 +0200)]
Update sk.po
Enrico Forestieri [Tue, 2 Oct 2018 19:36:01 +0000 (21:36 +0200)]
Update it.po
Pavel Sanda [Tue, 2 Oct 2018 14:59:33 +0000 (16:59 +0200)]
* cs.po
Juergen Spitzmueller [Tue, 2 Oct 2018 06:26:10 +0000 (08:26 +0200)]
de.po
Juergen Spitzmueller [Tue, 25 Sep 2018 11:13:56 +0000 (13:13 +0200)]
Do not store empty posttext for qualified citations
Fixes: #11308
(cherry picked from commit
90b13452037dba56b16f8fb55cce36aebc226804 )
Juergen Spitzmueller [Tue, 25 Sep 2018 13:24:46 +0000 (15:24 +0200)]
Add bibtex inset to outliner if "add to toc" is checked.
Fixes #11309
(cherry picked from commit
a89e3c344bdafd2922321e434c2384020318ed2e )
Juergen Spitzmueller [Sat, 29 Sep 2018 08:27:20 +0000 (10:27 +0200)]
Juergen Spitzmueller [Sat, 29 Sep 2018 07:18:26 +0000 (09:18 +0200)]
GuiCitation: Add some tooltips for the sake of keyboard users
Addresses #11317
(cherry picked from commit
cab46ff9d1ea3bd801050eb4834f2e16a8ad3152 )
Richard Kimberly Heck [Sat, 29 Sep 2018 21:44:25 +0000 (17:44 -0400)]
Fix mingw build script so as not to use version number for exectuables.
(cherry picked from commit
72367d94ad334ca54d9f37c325e185095178da3c )
Richard Kimberly Heck [Sat, 29 Sep 2018 21:26:14 +0000 (17:26 -0400)]
Try to make Windows use a versioned directory for the user dir.
(cherry picked from commit
802fd7932b713ee80bf384facd45f45a5ac22de4 )
(cherry picked from commit
4478451ea164a4de891b1d26ad3b1c04ad770337 )
Richard Kimberly Heck [Sat, 29 Sep 2018 21:29:27 +0000 (17:29 -0400)]
Revert "Check for old "LyX 2.3" user directory when configuring."
Actually, we DO use versioned directories on Windows.
This reverts commit
b738aa53d13780a4e271459d72171700cba304fa .
Stephan Witt [Sat, 29 Sep 2018 11:48:31 +0000 (13:48 +0200)]
Add missing status entries for Mac build fixes
Richard Kimberly Heck [Sat, 29 Sep 2018 02:17:15 +0000 (22:17 -0400)]
Update LyX packaging script.
Richard Kimberly Heck [Sat, 29 Sep 2018 01:42:49 +0000 (21:42 -0400)]
Check for old "LyX 2.3" user directory when configuring.
This is due to the bad packaging in the early 2.3.x installers. We
normally do not use version suffixes on Windows, but did.
Richard Kimberly Heck [Sat, 29 Sep 2018 01:50:25 +0000 (21:50 -0400)]
Windows packaging updates.
The main change here is that we need to delete LyX2.3.exe and
tex2lyx2.3.exe from the install directory, so they are not left
there (from previous, versioned installs).
Juergen Spitzmueller [Fri, 28 Sep 2018 06:36:44 +0000 (08:36 +0200)]
Use LTR environment for forceLTR content with polyglossia
Fixes: #10548
(cherry picked from commit
10c06f67c936d8a259b03f00084fd4969f17582b )
Richard Kimberly Heck [Fri, 28 Sep 2018 02:14:44 +0000 (22:14 -0400)]
Status for last commit.
Richard Kimberly Heck [Fri, 28 Sep 2018 01:56:29 +0000 (21:56 -0400)]
Allow 'module in child not used in master' warning to be disabled.
(cherry picked from commit
92ccf0a1a20e73a1ecf8d335ad2a2ef90ec9a89b )
Enrico Forestieri [Thu, 27 Sep 2018 19:32:24 +0000 (21:32 +0200)]
Fix bug #11210
On Windows, start viewers in detached processes in order to avoid
a crash of the QProcess destructor when their thread terminates.
The opening of a console window is avoided by redirecting to the
null device all standard I/O channels.
Richard Kimberly Heck [Thu, 27 Sep 2018 18:53:05 +0000 (14:53 -0400)]
No suffixes for binaries now.
Richard Kimberly Heck [Thu, 27 Sep 2018 18:53:41 +0000 (14:53 -0400)]
Fix build script for Windows: No suffixes.
Juergen Spitzmueller [Mon, 10 Sep 2018 10:29:22 +0000 (12:29 +0200)]
Amend
2d4ac90fd20eac once more
Only use local switch in RTL environment.
(cherry picked from commit
e158d661b924102acb87a3c92f800a463fdca408 )
Juergen Spitzmueller [Sat, 8 Sep 2018 10:50:42 +0000 (12:50 +0200)]
Amend
2d4ac90fd20eac
Properly close local language switch.
(cherry picked from commit
11163359772db1ca80dccde5087f55686b9da76d )