| Age | Commit message (Collapse) | Author |
|---|
|
At least the version of echo used to build TDF's LO 6.2.0.3 release apparently
doesn't understand that non-standard option and printed out "-n" verbatim,
generating a broken languages.js. (Though my local macOS 10.14.3 /bin/echo does
understand that option.)
Change-Id: I7233fa5c6e7851c5086c428a67aaee71604061e1
Reviewed-on: https://gerrit.libreoffice.org/67858
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 8986dec8229cf31ccfadb61e6e90c905f7033ac7)
Reviewed-on: https://gerrit.libreoffice.org/67860
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
|
|
...instead of with app:"SHARED", according to a request by buovjaga.
That means that helpcontent2/source/text/shared/explorer/database/*.xhp files
(and their per-locale counterparts) should be processed into workdir/
CustomTarget/helpcontent2/help3xsl/shared/explorer/database/*/bookmarks.part
(which were empty until now) instead of
workdir/CustomTarget/helpcontent2/help3xsl/shared/*/bookmarks.part.
This change requres gb_AllLangHelp_*_BOOKMARK_HELPFILES introduced into the core
repo with <https://gerrit.libreoffice.org/#/c/63364/> "Prepare
gb_AllLangHelp_add_helpfiles for special bookmark needs".
Change-Id: I8f37fcec67a37aee4260042e550214a34495254a
Reviewed-on: https://gerrit.libreoffice.org/63365
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Tied the index listing to the current module.
Fuzzysort.js is MIT licensed.
Change-Id: I5d95cc1870a1856089217846ed0af572abc882d7
Reviewed-on: https://gerrit.libreoffice.org/63203
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
|
|
Change-Id: I7185a7d0981abbacef4a152ee6ac5352ebe970cd
Reviewed-on: https://gerrit.libreoffice.org/59150
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
|
|
Change-Id: Ib81dbd9a4047d9bb63761a43ef0b183a450b03f1
Reviewed-on: https://gerrit.libreoffice.org/59047
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
|
|
Also update dependency, so that the file gets rebuilt when the 'echo'
part of the makefile changes.
Change-Id: I0412f882dd12e265d8261a259ed83c469e261cdf
Reviewed-on: https://gerrit.libreoffice.org/58993
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
|
|
Change-Id: I565ca442281fa8a80a59d1038d29b34d7f9d9f41
Reviewed-on: https://gerrit.libreoffice.org/58989
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
|
|
Change-Id: Ibc742e653f44093372bed4e103fedb3a597dfdac
Reviewed-on: https://gerrit.libreoffice.org/58793
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
|
|
At least Emacs warned about those "suspicious lines".
Change-Id: I587e7d65318a7fdb1634e49f2db761c853e67b05
Reviewed-on: https://gerrit.libreoffice.org/55383
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
There are three rules in helpcontent2/CustomTarget_html.mk that process (with
XSLT) all or some of the .xhp files in the helpcontent2/source/text/ tree (for
en-US; or their translations in the
workdir/HelpTranslatePartTarget/*/helpcontent2/source/text/ trees for other
languages). Lists of all those .xhp files are defined in
helpcontent2/AllLangHelp_*.mk (with gb_AllLangHelp_add_helpfiles), but the code
in helpcontent2/CustomTarget_html.mk used `find` to assemble the relevant lists.
That has two issues (at least for the en-US case operating on the untranslated
helpcontent2/source/text/ files): For one, if the content of those .xhp files
changes, the relevant XSLT processing is not re-run. For another, if .xhp files
are added to or removed from the lists in helpcontent2/AllLangHelp_*.mk, the
relevant XSLT processeing is not re-run, either.
For the processing of translated .xhp files, there were already dependencies on
those translated files in place. I assume (but have not really proved it) that
those dependencies are already sufficient to cover both of the above issues.
That only leaves the en-US case, operating on the untranslated files.
The lists of .xhp files as defined in helpcontent2/AllLangHelp_*.mk (with "*"
ranging over the various "modules": sbasic, scalc, schart, etc.) are now made
available in gb_AllLangHelp_*_HELPFILES variables. The contents of those
variables is used instead of `find` to pass the relevant .xhp files to the XSLT
processings. (Needing some RESPONSEFILE and `xargs -n 1` boilerplate to feed
individual files to the XSL processing without overflowing maximum command line
lengths. Also, on Windows, var2file apparently writes CRLF line ends but the CR
parts need to be filtered out again, and xargs problems must be worked around
similar to df9edbcd2883cec2d0596133131cfbc220dee91f "Work around 'xargs:
environment is too large for exec' errors on Windows".)
However, those variables apparently cannot be used to specify dependencies for
the three XSLT-processing rules. Presumably, the variables do not necessarily
have their values assigned yet by the time the rules' dependencies are
constructed (depending on the order in which .mk files are read?). So "dummy"
gb_AllLangHelp_get_helpfiles_target targets are introduced, which depend on all
the relevant .xhp files (and which get constructed during
gb_AllLangHelp_add_helpfiles, just like the gb_AllLangHelp_*_HELPFILES
variables), and which the XSLT-processing rules in turn depend on. That makes
sure that the XSLT-processing rules are re-run when the content of .xhp files
changes or when new .xhp files are added.
However, the above still fails to re-run the XSLT-processing rules when .xhp
files are removed.
This is the helpcontent2 part of a commit spanning core and helpcontent2.
Change-Id: I9a72c0f6837a8e13458a703fdecf7e5b0ef2076f
Reviewed-on: https://gerrit.libreoffice.org/55364
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
...that previously ended up in language-independent parts of installation sets.
The structure of that media/ tree doesn't allow to directly mis-use the existing
AllLangPackage machinery (which expects the language to be encoded in the first
pathname segment within the tree; and which is already mis-used for the
helpcontent2/AllLangPackage_html_lang.mk parts).
So introduce gb_AllLangPackage_add_files_for_lang that allows to specify the
language explicitly, independent of where it is encoded in the pathname (if at
all). The underlying gb_AllLangPackage_add_file sets a
gb_AllLangPackage_ALLDIRS that is used by `make packageinfo`, which may need
further fixing by anybody actually using that target; see the mail thread
starting at
<https://lists.freedesktop.org/archives/libreoffice/2018-May/080242.html>
"Broken --with-help=html `make packageinfo`".
All files in $(SRCDIR)/helpcontent2/source/media/ must now explicitly be listed
in either helpcontent2/Package_html_media.mk (for the language-independent
files) or helpcontent2/AllLangPackage_html_media_lang.mk (for the language-
specific files). Also note the two TODOs in
helpcontent2/AllLangPackage_html_media_lang.mk.
What is not quite right yet is that content from
helpcontent2/AllLangPackage_html_lang.mk and
helpcontent2/AllLangPackage_html_media_lang.mk is ending up in both per-language
helpcontent installation sets (as intended, via the instructions in
helpcontent2/CustomTarget_html.mk) and per-language languagepack installation
sets (which is unintended). This needs to be fixed with a follow-up commit.
This is the helpcontent2 part of a commit spanning core and helpcontent2.
Change-Id: Ie7916b75eee0dde3106e784d19e99fde5bb93195
Reviewed-on: https://gerrit.libreoffice.org/54749
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
...by extending the hackery in helpcontent2/CustomTarget_html.mk (see comment
there). (Ultimately, the gbuild HelpTarget machinery should probably be adapted
to the needs of this new help format, once the old help format is no longer
supported?)
The Perl packaging code finds source files through the "include" paths specified
in instsetoo_native/util/openoffice.lst.in. To avoid potential name clashes,
put the new .filelist files into
workdir/CustomTarget/helpcontent2/help3xsl/filelists/html-help/ sub-directories.
read_filelist in solenv/bin/modules/installer/filelists.pm does not strip white
space following the last item in a file list, but (with HAVE_GNUMAKE_FILE_FUNC)
the gb_HelpTarget_get_translation_target .filelist files (which are then
transformed with sed into the .html .filelist files read by the Perl packaging
code) may contain such trailing white space. So $(strip ...) their content in
solenv/gbuild/HelpTarget.mk.
This is the helpcontent2 part of a change spanning core and helpcontent2.
Change-Id: I730caaaec783d0a0a9c79caf85268a775220dee3
Reviewed-on: https://gerrit.libreoffice.org/53724
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: Ib8168a6ac770e81a8e5049d8d60e63aa04c7e64b
Reviewed-on: https://gerrit.libreoffice.org/53722
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Part two.
Part 1 is in sfx2 module
Remove product version from offline help path but keep
in online help.
Product version is kept for online because a help server can have more
than one helponline version.
Change-Id: I1d4ba12a7d6472defd4210c79349e35ccaf32d8d
Reviewed-on: https://gerrit.libreoffice.org/51126
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
|
|
JavaScript stuff moved from online_transform.xsl to help.js.
Simplified bookmarks markup.
Span elements with class "input" and length more than 3 characters
can be copied to clipboard by mouse click.
Bubli's feature request for auto-expanding contents per subitem
is also implemented.
Logic for adding headings to index list was reimplemented.
Change-Id: I87b6f189a040a73a1ab9dda1ec9cd790b06da202
Reviewed-on: https://gerrit.libreoffice.org/49421
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
|
|
Fuse.js has Apache License 2.0 and paginathing.js has
Expat License (aka MIT).
Paginathing is a paginating utility and it was originally jQuery,
but due to performance concerns I converted it to pure JavaScript
and rather brutally adapted it to our needs.
Fuse.js gives us fuzzy search with multiple strings. The settings
can be refined, if needed. Settings can be easily tested with the
live demo: http://fusejs.io/
Change-Id: I1cf6a6f7d06adbcac95760db90187ee26be8e908
Reviewed-on: https://gerrit.libreoffice.org/48906
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
|
|
Change-Id: I10cea1b204b20d482abec6a8f66d5cfee6cf6dfe
Reviewed-on: https://gerrit.libreoffice.org/48509
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
|
|
List.js - http://listjs.com/ - allows us to paginate the results
so the height does not get out of hand.
Fuzzy search would be cool: http://listjs.com/docs/fuzzysearch/
...but it gives too big of a perf hit with our 5700 items.
Might try to bribe the creator to look into perf.
Thanks a lot to David Tardon for the makefile solution and to
Christian Lohmaier for playing a rubber duck.
Change-Id: I359eed541470ccaa309b0b6ff5d809a796d9befd
Reviewed-on: https://gerrit.libreoffice.org/48335
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
|
|
Now <base href="/"> is changed to
<base href="../../../ (...) ../" to allow links to
operate with http:// and file:// protocol
Drop param from makefile too
Change-Id: I1aea5b9c564bdfe395e95400ecf87e068a5a7c86
Reviewed-on: https://gerrit.libreoffice.org/46932
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
|
|
Change-Id: Ib926dc2cd815a8d7e43c7cdcbccecd6c65f11980
|
|
Change-Id: Ic38ee7b9a3ee4a45bede9d494f717d833e53d69f
|
