Add icon to donation button in Help pages.

Change-Id: I3f565f9245252c4ca417dff9b49df272b4733648
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/196526
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

AllLangHelp_scalc.mk

@@ -113,7 +113,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/05120300 \
     helpcontent2/source/text/scalc/01/05120400 \
     helpcontent2/source/text/scalc/01/05120500 \
-    helpcontent2/source/text/scalc/01/06020000 \
     helpcontent2/source/text/scalc/01/06030000 \
     helpcontent2/source/text/scalc/01/06030100 \
     helpcontent2/source/text/scalc/01/06030200 \
@@ -183,6 +182,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/data_form \
     helpcontent2/source/text/scalc/01/databar_more_options \
     helpcontent2/source/text/scalc/01/database_table_reference \
+    helpcontent2/source/text/scalc/01/data_provider \
     helpcontent2/source/text/scalc/01/default_number_formats \
     helpcontent2/source/text/scalc/01/DeleteNote \
     helpcontent2/source/text/scalc/01/DeleteAllNotes \
@@ -204,6 +204,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_char \
     helpcontent2/source/text/scalc/01/func_clean \
     helpcontent2/source/text/scalc/01/func_ceiling \
+    helpcontent2/source/text/scalc/01/func_choosecols \
+    helpcontent2/source/text/scalc/01/func_chooserows \
     helpcontent2/source/text/scalc/01/func_countifs \
     helpcontent2/source/text/scalc/01/func_color \
     helpcontent2/source/text/scalc/01/func_code \
@@ -218,6 +220,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_days360 \
     helpcontent2/source/text/scalc/01/func_decimal \
     helpcontent2/source/text/scalc/01/func_dollar \
+    helpcontent2/source/text/scalc/01/func_drop \
+    helpcontent2/source/text/scalc/01/func_encodeurl \
     helpcontent2/source/text/scalc/01/func_exact \
     helpcontent2/source/text/scalc/01/func_find \
     helpcontent2/source/text/scalc/01/func_fixed \
@@ -228,7 +232,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_edate \
     helpcontent2/source/text/scalc/01/func_eomonth \
     helpcontent2/source/text/scalc/01/func_error_type \
+    helpcontent2/source/text/scalc/01/func_expand \
     helpcontent2/source/text/scalc/01/func_filter \
+    helpcontent2/source/text/scalc/01/func_filterxml \
     helpcontent2/source/text/scalc/01/func_findb \
     helpcontent2/source/text/scalc/01/func_floor \
     helpcontent2/source/text/scalc/01/func_forecastetsadd \
@@ -241,6 +247,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_fourier \
     helpcontent2/source/text/scalc/01/exponsmooth_embd \
     helpcontent2/source/text/scalc/01/func_hour \
+    helpcontent2/source/text/scalc/01/func_hstack \
     helpcontent2/source/text/scalc/01/func_ifs \
     helpcontent2/source/text/scalc/01/func_imcot \
     helpcontent2/source/text/scalc/01/func_imcos \
@@ -256,6 +263,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_jis \
     helpcontent2/source/text/scalc/01/func_leftb \
     helpcontent2/source/text/scalc/01/func_lenb \
+    helpcontent2/source/text/scalc/01/func_lookup \
     helpcontent2/source/text/scalc/01/func_mid \
     helpcontent2/source/text/scalc/01/func_midb \
     helpcontent2/source/text/scalc/01/func_rightb \
@@ -282,7 +290,10 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_search \
     helpcontent2/source/text/scalc/01/func_substitute \
     helpcontent2/source/text/scalc/01/func_t \
+    helpcontent2/source/text/scalc/01/func_take \
     helpcontent2/source/text/scalc/01/func_text \
+    helpcontent2/source/text/scalc/01/func_tocol \
+    helpcontent2/source/text/scalc/01/func_torow \
     helpcontent2/source/text/scalc/01/func_trim \
     helpcontent2/source/text/scalc/01/func_unichar \
     helpcontent2/source/text/scalc/01/func_unicode \
@@ -305,13 +316,17 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_sumif \
     helpcontent2/source/text/scalc/01/func_sumifs \
     helpcontent2/source/text/scalc/01/func_switch \
+    helpcontent2/source/text/scalc/01/func_textafter \
+    helpcontent2/source/text/scalc/01/func_textbefore \
     helpcontent2/source/text/scalc/01/func_textjoin \
+    helpcontent2/source/text/scalc/01/func_textsplit \
     helpcontent2/source/text/scalc/01/func_time \
     helpcontent2/source/text/scalc/01/func_timevalue \
     helpcontent2/source/text/scalc/01/func_today \
     helpcontent2/source/text/scalc/01/func_trunc \
     helpcontent2/source/text/scalc/01/func_unique \
     helpcontent2/source/text/scalc/01/func_value \
+    helpcontent2/source/text/scalc/01/func_vstack \
     helpcontent2/source/text/scalc/01/func_xlookup \
     helpcontent2/source/text/scalc/01/func_xmatch \
     helpcontent2/source/text/scalc/01/func_weekday \
@@ -320,6 +335,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_weeknum_ooo \
     helpcontent2/source/text/scalc/01/func_weeknumadd \
     helpcontent2/source/text/scalc/01/func_workday \
+    helpcontent2/source/text/scalc/01/func_wrapcols \
+    helpcontent2/source/text/scalc/01/func_wraprows \
     helpcontent2/source/text/scalc/01/func_year \
     helpcontent2/source/text/scalc/01/func_yearfrac \
     helpcontent2/source/text/scalc/01/HandleDuplicateRecords \
@@ -336,6 +353,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/MergeCellsMenu \
     helpcontent2/source/text/scalc/01/NavigateMenu \
     helpcontent2/source/text/scalc/01/NormalViewMode \
+    helpcontent2/source/text/scalc/01/pastespecialcalc \
+    helpcontent2/source/text/scalc/01/ODFF \
     helpcontent2/source/text/scalc/01/recalculate_hard \
     helpcontent2/source/text/scalc/01/SelectColumn \
     helpcontent2/source/text/scalc/01/SelectData \
@@ -346,6 +365,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/sheet_tab_color \
     helpcontent2/source/text/scalc/01/ShowNote \
     helpcontent2/source/text/scalc/01/sidebar_alignment \
+    helpcontent2/source/text/scalc/01/sidebar_cell_appearance \
     helpcontent2/source/text/scalc/01/sidebar_number_format \
     helpcontent2/source/text/scalc/01/solver \
     helpcontent2/source/text/scalc/01/solver_options \
@@ -366,7 +386,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/statistics_test_t \
     helpcontent2/source/text/scalc/01/statistics_test_z \
     helpcontent2/source/text/scalc/01/stat_data \
-    helpcontent2/source/text/scalc/01/ODFF \
     helpcontent2/source/text/scalc/01/TableSelectAll \
     helpcontent2/source/text/scalc/01/text2columns \
     helpcontent2/source/text/scalc/01/ToggleFormula \
@@ -448,6 +467,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/guide/goalseek \
     helpcontent2/source/text/scalc/guide/html_doc \
     helpcontent2/source/text/scalc/guide/integer_leading_zero \
+    helpcontent2/source/text/scalc/guide/json \
     helpcontent2/source/text/scalc/guide/keyboard \
     helpcontent2/source/text/scalc/guide/line_fix \
     helpcontent2/source/text/scalc/guide/main \
@@ -470,6 +490,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/guide/print_landscape \
     helpcontent2/source/text/scalc/guide/print_title_row \
     helpcontent2/source/text/scalc/guide/printranges \
+    helpcontent2/source/text/scalc/guide/r1c1syntax \
     helpcontent2/source/text/scalc/guide/relativ_absolut_ref \
     helpcontent2/source/text/scalc/guide/remove_duplicates \
     helpcontent2/source/text/scalc/guide/rename_table \
@@ -495,8 +516,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/menu/sheet_tab_menu \
     helpcontent2/source/text/scalc/main0000 \
     helpcontent2/source/text/scalc/main0100 \
-    helpcontent2/source/text/scalc/main0102 \
-    helpcontent2/source/text/scalc/main0105 \
     helpcontent2/source/text/scalc/main0112 \
     helpcontent2/source/text/scalc/main0116 \
     helpcontent2/source/text/scalc/main0200 \

AllLangHelp_schart.mk

@@ -57,6 +57,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,schart,\
     helpcontent2/source/text/schart/01/type_column_line \
     helpcontent2/source/text/schart/01/type_line \
     helpcontent2/source/text/schart/01/type_net \
+    helpcontent2/source/text/schart/01/type_ofpie \
     helpcontent2/source/text/schart/01/type_pie \
     helpcontent2/source/text/schart/01/type_stock \
     helpcontent2/source/text/schart/01/type_xy \

AllLangHelp_sdatabase.mk

@@ -74,7 +74,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
     helpcontent2/source/text/sdatabase/dabawiz02text \
     helpcontent2/source/text/sdatabase/dabawiz03auth \
     helpcontent2/source/text/sdatabase/menubar \
-    helpcontent2/source/text/sdatabase/menuedit \
     helpcontent2/source/text/sdatabase/menufile \
     helpcontent2/source/text/sdatabase/menufilesave \
     helpcontent2/source/text/sdatabase/menuinsert \

AllLangHelp_sdraw.mk

@@ -53,9 +53,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\
     helpcontent2/source/text/sdraw/guide/text_enter \
     helpcontent2/source/text/sdraw/main0000 \
     helpcontent2/source/text/sdraw/main0100 \
-    helpcontent2/source/text/sdraw/main_edit \
     helpcontent2/source/text/sdraw/main_insert \
-    helpcontent2/source/text/sdraw/main_format \
     helpcontent2/source/text/sdraw/main_page \
     helpcontent2/source/text/sdraw/main_shape \
     helpcontent2/source/text/sdraw/main0200 \

AllLangHelp_shared.mk

@@ -72,8 +72,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/01010202 \
     helpcontent2/source/text/shared/01/01010203 \
     helpcontent2/source/text/shared/01/01010300 \
-    helpcontent2/source/text/shared/01/01010301 \
-    helpcontent2/source/text/shared/01/01010302 \
     helpcontent2/source/text/shared/01/01010303 \
     helpcontent2/source/text/shared/01/01010304 \
     helpcontent2/source/text/shared/01/01020000 \
@@ -364,6 +362,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/graphic_styles \
     helpcontent2/source/text/shared/01/grid_and_helplines \
     helpcontent2/source/text/shared/01/guides \
+    helpcontent2/source/text/shared/01/hyphenation \
     helpcontent2/source/text/shared/01/image_compression \
     helpcontent2/source/text/shared/01/image_external_tool \
     helpcontent2/source/text/shared/01/insert_chart \
@@ -768,7 +767,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/guide/fax \
     helpcontent2/source/text/shared/guide/filternavigator \
     helpcontent2/source/text/shared/guide/find_attributes \
-    helpcontent2/source/text/shared/guide/flat_icons \
     helpcontent2/source/text/shared/guide/floating_toolbar \
     helpcontent2/source/text/shared/guide/fontwork \
     helpcontent2/source/text/shared/guide/formfields \
@@ -843,6 +841,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/guide/xsltfilter_create \
     helpcontent2/source/text/shared/guide/xsltfilter_distribute \
     helpcontent2/source/text/shared/main0103 \
+    helpcontent2/source/text/shared/main_edit \
+    helpcontent2/source/text/shared/main_format \
     helpcontent2/source/text/shared/main0104 \
     helpcontent2/source/text/shared/main0107 \
     helpcontent2/source/text/shared/main0108 \

AllLangHelp_simpress.mk

@@ -77,7 +77,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
     helpcontent2/source/text/simpress/01/05250500 \
     helpcontent2/source/text/simpress/01/05250600 \
     helpcontent2/source/text/simpress/01/05250700 \
-    helpcontent2/source/text/simpress/01/06030000 \
     helpcontent2/source/text/simpress/01/06040000 \
     helpcontent2/source/text/simpress/01/06050000 \
     helpcontent2/source/text/simpress/01/06060000 \
@@ -108,6 +107,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
     helpcontent2/source/text/simpress/01/effectoptionstiming \
     helpcontent2/source/text/simpress/01/PresentationMinimizer \
     helpcontent2/source/text/simpress/01/remoteconnections \
+    helpcontent2/source/text/simpress/01/sidebarslidebackground \
     helpcontent2/source/text/simpress/01/slidesorter \
     helpcontent2/source/text/simpress/02/04010000 \
     helpcontent2/source/text/simpress/02/04020000 \
@@ -183,8 +183,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
     helpcontent2/source/text/simpress/guide/vectorize \
     helpcontent2/source/text/simpress/main0000 \
     helpcontent2/source/text/simpress/main0100 \
-    helpcontent2/source/text/simpress/main_edit \
-    helpcontent2/source/text/simpress/main_format \
     helpcontent2/source/text/simpress/main0113 \
     helpcontent2/source/text/simpress/main0114 \
     helpcontent2/source/text/simpress/main_slide \

AllLangHelp_smath.mk

@@ -86,7 +86,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,smath,\
     helpcontent2/source/text/smath/guide/text \
     helpcontent2/source/text/smath/main0000 \
     helpcontent2/source/text/smath/main0100 \
-    helpcontent2/source/text/smath/main0102 \
     helpcontent2/source/text/smath/main0105 \
     helpcontent2/source/text/smath/main0106 \
     helpcontent2/source/text/smath/main0200 \

AllLangHelp_swriter.mk

@@ -145,7 +145,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/01/05170000 \
     helpcontent2/source/text/swriter/01/05190000 \
     helpcontent2/source/text/swriter/01/05200000 \
-    helpcontent2/source/text/swriter/01/06030000 \
     helpcontent2/source/text/swriter/01/06040000 \
     helpcontent2/source/text/swriter/01/06060000 \
     helpcontent2/source/text/swriter/01/06060100 \
@@ -164,12 +163,15 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/01/06210000 \
     helpcontent2/source/text/swriter/01/06220000 \
     helpcontent2/source/text/swriter/01/06990000 \
+    helpcontent2/source/text/swriter/01/baseline_grid \
     helpcontent2/source/text/swriter/01/paragraph_hyphenation \
     helpcontent2/source/text/swriter/01/contentcontrol00 \
+    helpcontent2/source/text/swriter/01/copyfielddialog \
     helpcontent2/source/text/swriter/01/accessibility_check \
     helpcontent2/source/text/swriter/01/format_object \
     helpcontent2/source/text/swriter/01/format_frame \
     helpcontent2/source/text/swriter/01/goto \
+    helpcontent2/source/text/swriter/01/HeaderFooterWin \
     helpcontent2/source/text/swriter/01/HeadingRowsRepeat \
     helpcontent2/source/text/swriter/01/legacynumbering \
     helpcontent2/source/text/swriter/01/mailmerge00 \
@@ -342,6 +344,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/guide/keyboard \
     helpcontent2/source/text/swriter/guide/load_styles \
     helpcontent2/source/text/swriter/guide/main \
+    helpcontent2/source/text/swriter/guide/markdown \
     helpcontent2/source/text/swriter/guide/navigator \
     helpcontent2/source/text/swriter/guide/nonprintable_text \
     helpcontent2/source/text/swriter/guide/number_date_conv \
@@ -410,8 +413,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/librelogo/LibreLogo \
     helpcontent2/source/text/swriter/main0000 \
     helpcontent2/source/text/swriter/main0100 \
-    helpcontent2/source/text/swriter/main0102 \
-    helpcontent2/source/text/swriter/main0105 \
     helpcontent2/source/text/swriter/main0110 \
     helpcontent2/source/text/swriter/main0120 \
     helpcontent2/source/text/swriter/main0200 \
@@ -434,6 +435,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/menu/insert_frame \
     helpcontent2/source/text/swriter/menu/submenu_more_breaks \
     helpcontent2/source/text/swriter/menu/contentcontrol_submenu \
+    helpcontent2/source/text/swriter/menu/pageLayoutMenu \
     helpcontent2/source/text/swriter/mailmergetoolbar \
     helpcontent2/source/text/swriter/track_changes_toolbar \
     helpcontent2/source/text/swriter/navigate_toolbar \

AllLangPackage_html_media_lang.mk

@@ -263,7 +263,6 @@ $(foreach lang,$(filter-out en-US,$(gb_HELP_LANGS)),$(eval $(call gb_AllLangPack
     screenshots/cui/ui/hyperlinkinternetpage/$(lang)/HyperlinkInternetPage.png \
     screenshots/cui/ui/hyperlinkmailpage/$(lang)/HyperlinkMailPage.png \
     screenshots/cui/ui/hyperlinknewdocpage/$(lang)/HyperlinkNewDocPage.png \
-    screenshots/cui/ui/optviewpage/$(lang)/OptViewPage.png \
     screenshots/cui/ui/optfltrpage/$(lang)/OptFltrPage.png \
     screenshots/cui/ui/opthtmlpage/$(lang)/OptHtmlPage.png \
     screenshots/cui/ui/optaccessibilitypage/$(lang)/OptAccessibilityPage.png \

CustomTarget_html.mk

@@ -14,7 +14,7 @@ html_TREE_MODULES := swriter scalc simpress sdraw sdatabase smath schart sbasic
 html_TEXT_MODULES := $(html_TREE_MODULES)
 html_BMARK_MODULES := swriter:WRITER scalc:CALC simpress:IMPRESS sdraw:DRAW sdatabase:BASE smath:MATH schart:CHART sbasic:BASIC shared:SHARED
 
-gb_html_allhelpfiles = $(foreach module,$(html_TEXT_MODULES),$(gb_AllLangHelp_$(module)_HELPFILES))
+gb_html_allhelpfiles = $(sort $(subst helpcontent2/source/text/,,$(foreach module,$(html_TEXT_MODULES),$(gb_AllLangHelp_$(module)_HELPFILES))))
 
 # In case someone has a product name containing quotes, use Unicode
 # code points for ' (27) and " (22) in JS, CSS and entities for HTML.
@@ -50,7 +50,7 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/hid2file.js : \
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1)
 	$(call gb_Trace_StartRange,$(@F),XSL)
 	( \
-		RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst helpcontent2/source/text/,,$(gb_html_allhelpfiles)$(if $(filter WNT,$(OS)), )))  && \
+		RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(gb_html_allhelpfiles)$(if $(filter WNT,$(OS)), ))  && \
 		echo 'var hid2fileMap = {' \
 		&& cd $(SRCDIR)/helpcontent2/source/text && $(call gb_ExternalExecutable_get_command,xsltproc,$(if $(filter WNT,$(OS)),env -i $(gb_Helper_set_ld_path)) xargs) $< <$$RESPONSEFILE || { rm $$RESPONSEFILE; exit 1 ; } \
 		&& rm "$$RESPONSEFILE" \
@@ -58,19 +58,15 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/hid2file.js : \
 	) > $@
 	$(call gb_Trace_EndRange,$(@F),XSL)
 
+# copy en-US file so that pattern rules below don't need special treatment for en-US
+$(gb_HelpTranslatePartTarget_workdir)/en-US/helpcontent2/source/text/shared/help/browserhelp.xhp: $(SRCDIR)/helpcontent2/source/text/shared/help/browserhelp.xhp
+	mkdir -p $(@D) && cp $< $@
 
 # Xapian localized templates
 ifeq ($(HELP_OMINDEX_PAGE),TRUE)
 
-define html_gen_xaptpl_dep
-$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/xap_tpl : \
-	$(if $(filter en-US,$(1)),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$(1))/helpcontent2/source/text/shared/help/browserhelp.xhp
-
-endef
-	
-$(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_xaptpl_dep,$(lang))))
-
 $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/xap_tpl : \
+        $(gb_HelpTranslatePartTarget_workdir)/%/helpcontent2/source/text/shared/help/browserhelp.xhp \
         $(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \
         $(SRCDIR)/helpcontent2/CustomTarget_html.mk \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
@@ -83,27 +79,19 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/xap_tpl : \
 		--stringparam productversion "$(PRODUCTVERSION)" \
 		-o $@ \
 		$(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \
-		$(if $(filter en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*)/helpcontent2/source/text/shared/help/browserhelp.xhp \
+		$(gb_HelpTranslatePartTarget_workdir)/$*/helpcontent2/source/text/shared/help/browserhelp.xhp \
 	)
 	$(call gb_Trace_EndRange,$*/$(@F),XSL)
 
 endif
 
 # set of installed languages - has to be language independent
-$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/languages.js : \
-        $(SRCDIR)/helpcontent2/CustomTarget_html.mk
-	printf 'var languagesSet = new Set([%s]);\n' "$(subst $(WHITESPACE),$(COMMA) ,$(patsubst %,'%',$(gb_HELP_LANGS)))" > $@
-
-define html_gen_langnames_js_dep
-$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/langnames.js : \
-	$(if $(filter en-US,$(1)),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$(1))/helpcontent2/source/text/shared/help/browserhelp.xhp
-
-endef
-
-$(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_langnames_js_dep,$(lang))))
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/languages.js : $(SRCDIR)/helpcontent2/CustomTarget_html.mk
+	$(file >$@,var languagesSet = new Set([$(subst $(WHITESPACE),$(COMMA) ,$(patsubst %,'%',$(gb_HELP_LANGS)))]);)
 
 # names of the languages - has to be translated, ie. per language
 $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/langnames.js : \
+        $(gb_HelpTranslatePartTarget_workdir)/%/helpcontent2/source/text/shared/help/browserhelp.xhp \
         $(SRCDIR)/helpcontent2/CustomTarget_html.mk
 	( \
 		echo 'var languageNames = {' ; \
@@ -191,9 +179,9 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/html.text : \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1)
 	$(call gb_Trace_StartRange,$*/$(@F),XSL)
-	rm -rf $(dir $@)text && mkdir -p $(dir $@)text && cd $(dir $@)text && mkdir -p $(sort $(subst helpcontent2/source/text/,,$(dir $(gb_html_allhelpfiles)))) \
+	rm -rf $(dir $@)text && mkdir -p $(dir $@)text && cd $(dir $@)text && mkdir -p $(sort $(dir $(gb_html_allhelpfiles))) \
 	&& cd $(if $(filter en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*) \
-	&& RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(addsuffix $(WHITESPACE)dummyIgnoreCRinEOL$(NEWLINE),$(subst helpcontent2/source/,,$(gb_html_allhelpfiles)))) \
+	&& RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(addsuffix $(WHITESPACE)dummyIgnoreCRinEOL$(NEWLINE),$(gb_html_allhelpfiles))) \
 	&& while read xhp dummy; do \
 	    $(call gb_ExternalExecutable_get_command,xsltproc) \
 	        --stringparam Language $* \
@@ -202,9 +190,9 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/html.text : \
 	        --stringparam productname "$(gb_PRODUCTNAME_HTML)" \
 	        --stringparam productversion "$(PRODUCTVERSION)" \
 	        --stringparam xapian $(if $(filter TRUE, $(HELP_OMINDEX_PAGE)),'yes','no') \
-	        -o $(dir $@)$${xhp%.xhp}.html \
+	        -o $(dir $@)/text/$${xhp%.xhp}.html \
 	        $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/online_transform.xsl \
-	        helpcontent2/source/$$xhp \
+	        helpcontent2/source/text/$$xhp \
 	    || exit \
 	; done <"$$RESPONSEFILE" \
 	&& rm "$$RESPONSEFILE" \

Package_html_media.mk

@@ -51,6 +51,7 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     helpimg/dircurscent.png \
     helpimg/dircursleft.png \
     helpimg/dircursright.png \
+    helpimg/donate.png \
     helpimg/ein.png \
     helpimg/feldalle.png \
     helpimg/feldbrei.png \
@@ -95,6 +96,7 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     helpimg/scalc/IMCOT_equation.svg \
     helpimg/sc_func_imsin.svg \
     helpimg/sc_func_imsinh.svg \
+    helpimg/scalc/country_codes.png \
     helpimg/scalc/IMCSC_equation.svg \
     helpimg/scalc/IMCSCH_equation.svg \
     helpimg/scalc/IMSEC_equation.svg \
@@ -177,10 +179,12 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     helpimg/sbasic/While_statement.svg \
     helpimg/sbasic/With_statement.svg \
     helpimg/sbasic/Write_statement.svg \
+    helpimg/schart/CategoryProperties.png \
     helpimg/scalc/coordinates-to-polar-01.svg \
     helpimg/scalc/calczoomslider.png \
     helpimg/sdraw/area-fill-none-same-vs-background.png \
     helpimg/sdraw/control_points.png \
+    helpimg/sdraw/dimension01.svg \
     helpimg/sdraw/distribute-orig.svg \
     helpimg/sdraw/distribute-HR.svg \
     helpimg/sdraw/distribute-HL.svg \
@@ -373,6 +377,7 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     helpimg/starmath/un21221.svg \
     helpimg/python/python_interactive_console.png \
     helpimg/python/python_shell.png \
+    helpimg/swriter/MasterDocuments.png \
     helpimg/sw_paste_range.png \
     helpimg/sw_signatureline01.png \
     helpimg/sw_signatureline02.png \
@@ -439,7 +444,6 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     screenshots/cui/ui/hyperlinkinternetpage/HyperlinkInternetPage.png \
     screenshots/cui/ui/hyperlinkmailpage/HyperlinkMailPage.png \
     screenshots/cui/ui/hyperlinknewdocpage/HyperlinkNewDocPage.png \
-    screenshots/cui/ui/optviewpage/OptViewPage.png \
     screenshots/cui/ui/optfltrpage/OptFltrPage.png \
     screenshots/cui/ui/opthtmlpage/OptHtmlPage.png \
     screenshots/cui/ui/optaccessibilitypage/OptAccessibilityPage.png \

help3xsl/default.css

@@ -57,6 +57,7 @@ h4,
 h5,
 h6,
 .listitem,
+.description,
 .listitemintable,
 .tablecontent {
     font-family: var(--font-body);
@@ -139,12 +140,18 @@ pre,
     font-family: var(--font-mono);
     overflow-wrap: anywhere;
 }
+.code,
+.codeintable{
+    display:inline-block;
+}
 /* prevent SVGs without width from overflowing the container */
 img[src$=".svg"] {
     max-width: 100%;
 }
 .literal {
     white-space: normal;
+    word-break: keep-all;
+    overflow-wrap: break-word;
 }
 .smathcode {
     border-radius: 2px;
@@ -164,6 +171,7 @@ img[src$=".svg"] {
 }
 .keycode {
     font-family: var(--font-mono);
+    font-style:italic;
 }
 .widget {
     padding: 1px 10px;
@@ -229,6 +237,10 @@ pre[class*="language-"] > code {
     padding: 0.3em;
     /* background: var(--heading-color); */
 }
+.iconcell img {
+    min-width: 38px;
+    min-height: 38px;
+}
 
 table {
     background: var(--background-color);
@@ -694,10 +706,11 @@ li.disabled a {
 .donation {
     border: 1px solid #f1c62a;
     border-radius: 2px;
-    padding: 10px;
+    padding: 5px 10px;
     margin: 5px 10px;
     max-width: 200px;
     color: white;
+    align-items:center;
 }
 .donation:hover {
     background: linear-gradient(90deg, #1c71d8 0%, #30c877 100%);
@@ -1060,6 +1073,11 @@ li.disabled a {
         color: var(--visited-color);;
     }
 
+    .code,
+    .codeintable{
+        background-color:black;
+    }
+
     .note {
         background-color: #2E2E2E;
         border-left-color: #03DAC6;
@@ -1070,6 +1088,7 @@ li.disabled a {
         border-left-color: #BB86FC;
     }
 
+
     .warning {
         background-color: #2E2E2E;
         border-left-color: #CF6679;
@@ -1143,10 +1162,9 @@ li.disabled a {
         cursor: pointer;
         color: var(--heading-color);
     }
-    #DisplayArea
-    {
+    #DisplayArea {
         background-color: var(--background-color);
-        color: #efefef
+        color: #efefef;
     }
     .xapian-donation,
     .sf_table {
@@ -1165,11 +1183,11 @@ li.disabled a {
         background: var(--background-color);
         color: var(--heading-color);
         vertical-align: top;
-        border-style:solid;
-        border-color:#888;
-        border-width:thin;
+        border-style: solid;
+        border-color: #888;
+        border-width: thin;
     }
-    table{
+    table {
         background: var(--table-background);
     }
     tr:nth-of-type(even) {
@@ -1179,3 +1197,4 @@ li.disabled a {
         color: black;
     }
 }
+

help3xsl/help2.js

@@ -126,6 +126,10 @@ function getParameterByName(name, url) {
     return decodeURIComponent(results[2].replace(/\+/g, " "));
 }
 
+// This is used when arriving the first time via the application
+// or direct access to web root, e.g. a web search. It should not
+// be used outside of online context as then we can not guarantee
+// en-US as a fallback language.
 function existingLang(lang) {
     if (lang === undefined) {
         return 'en-US';
@@ -223,7 +227,7 @@ if (Math.max(document.documentElement.clientWidth, window.innerWidth || 0) < 960
 }
 
 const href = window.location.href;
-const lang = existingLang(getParameterByName("Language", href) || navigator.language);
+const lang = getParameterByName("Language", href) || document.querySelector("html").getAttribute("lang");
 setupModules(lang);
 setupLanguages(href);
 

help3xsl/noscript.xsl

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-* This file is part of the LibreOffice project.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public
-* License, v. 2.0. If a copy of the MPL was not distributed with this
-* file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-<!--
-Stylesheet to create the localized noscript error page.
-xsltproc noscript.xsl <browserhelp.xhp>
--->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:include href="brand.xsl"/>
-<xsl:output indent="yes" method="html"/>
-    <xsl:param name="productname"/>
-    <xsl:param name="productversion"/>
-
-<xsl:template match="/">
-<html>
-<head>
-</head>
-<body>
-<div style="margin: 20px">
-<h1 style="color: red;">
-<xsl:call-template name="brand">
-<xsl:with-param name="string"><xsl:value-of select="//variable[@id='noscriptmsg']"/></xsl:with-param>
-</xsl:call-template>
-</h1>
-</div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>

help3xsl/online_transform.xsl

@@ -92,6 +92,7 @@
 <xsl:variable name="note_img" select="concat($img_url_prefix,'icon-themes/res/helpimg/note.svg')"/>
 <xsl:variable name="tip_img" select="concat($img_url_prefix,'icon-themes/res/helpimg/tip.svg')"/>
 <xsl:variable name="warning_img" select="concat($img_url_prefix,'icon-themes/res/helpimg/warning.svg')"/>
+<xsl:variable name="donate_img" select="concat($img_url_prefix,'helpimg/donate.png')"/>
 
 <!-- Strings for the help UI page -->
 <xsl:variable name="tmp_href_ui"><xsl:value-of select="concat($urlpre,'text/shared/help/browserhelp.xhp')"/></xsl:variable>
@@ -122,7 +123,9 @@
 
 <!-- Create the document skeleton -->
 <xsl:template match="/">
-    <xsl:variable name="htmlpage"><xsl:value-of select="concat(substring-before($filename,'.xhp'),'.html')"/></xsl:variable>
+    <xsl:variable name="htmlpage">
+        <xsl:value-of select="concat(substring-before($filename,'.xhp'),'.html')"/>
+    </xsl:variable>
     <xsl:variable name="titleL10N">
         <xsl:call-template name="brand"><xsl:with-param name="string"><xsl:value-of select="$title"/></xsl:with-param></xsl:call-template>
     </xsl:variable>
@@ -147,14 +150,24 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:variable>
+    <xsl:variable name="meta_description">
+        <xsl:call-template name="brand">
+            <xsl:with-param name="string">
+                 <xsl:value-of select="substring(concat($productname,': ',//description),1,170)"/>
+            </xsl:with-param>
+        </xsl:call-template>
+    </xsl:variable>
 <html lang="{$lang}" dir="{$direction}">
     <head>
         <base href="{$install}"/>
+        <title><xsl:value-of disable-output-escaping="yes" select="$titleL10N"/></title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <xsl:if test="//description">
+            <meta name="description" contents="{$meta_description}"/>
+        </xsl:if>
         <xsl:if test="$online">
             <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
         </xsl:if>
-        <title><xsl:value-of disable-output-escaping="yes" select="$titleL10N"/></title>
         <link rel="shortcut icon" href="media/navigation/favicon.ico"/>
         <link  type="text/css" href="normalize.css" rel="Stylesheet"/>
         <link  type="text/css" href="prism.css" rel="Stylesheet"/>
@@ -178,6 +191,7 @@
         <xsl:if test="//topic[@indexer='exclude']">
             <meta name="robots" content="noindex"/>
         </xsl:if>
+
     </head>
     <body>
 
@@ -262,12 +276,18 @@
         <xsl:apply-templates select="/helpdocument/body"/>
     </div>
     <div id="DonationFrame">
-        <xsl:if test="$online">
-            <div class="donation">
-                <p dir="auto"><a href="https://www.libreoffice.org/donate/?pk_campaign=help" target ="_blank"><xsl:value-of select="$ui_donate"/></a></p>
+        <a href="https://www.libreoffice.org/donate/?pk_campaign=help" target ="_blank">
+        <div class="icontable donation">
+            <div class="iconcell">
+                <img class="iconimage" src="{$donate_img}" alt="{$ui_donate}" style="{$iconsizestyle}"/>
             </div>
-        </xsl:if>
+            <div class="iconcell">
+                <p dir="auto"><xsl:value-of select="$ui_donate"/></p>
+            </div>
+        </div>
+        </a>
     </div>
+
     <footer>
         <h2 style="text-align: center;"><a href="https://books.libreoffice.org" target="_blank"><xsl:value-of select="$ui_books"/></a></h2>
         <div class="noteicon" dir="auto" style="display:flex;justify-content:center;flex-wrap:wrap;row-gap:15px;">
@@ -802,33 +822,16 @@
 </xsl:template>
 
 <!--NOTE TIP AND WARNING-->
+
 <xsl:template match="tip | note | warning">
-    <xsl:variable name="imgsrc">
-        <xsl:choose>
-            <xsl:when test="local-name()='note'"><xsl:value-of select="$note_img"/></xsl:when>
-            <xsl:when test="local-name()='tip'"><xsl:value-of select="$tip_img"/></xsl:when>
-            <xsl:when test="local-name()='warning'"><xsl:value-of select="$warning_img"/></xsl:when>
-        </xsl:choose>
-    </xsl:variable>
-    <div class="{local-name()}">
-        <div class="noteicon" dir="auto"><img src="{$imgsrc}" alt="{local-name()}" style="{$iconsizestyle}"/></div>
-        <div class="notetext"><p id="{@id}" dir="auto"><xsl:apply-templates /></p></div>
-    </div>
-    <br/>
+    <xsl:call-template name="insertnote">
+        <xsl:with-param name="type" select="local-name()" />
+    </xsl:call-template>
 </xsl:template>
 <xsl:template match="tip | note | warning" mode="embedded">
-    <xsl:variable name="imgsrc">
-        <xsl:choose>
-            <xsl:when test="local-name()='note'"><xsl:value-of select="$note_img"/></xsl:when>
-            <xsl:when test="local-name()='tip'"><xsl:value-of select="$tip_img"/></xsl:when>
-            <xsl:when test="local-name()='warning'"><xsl:value-of select="$warning_img"/></xsl:when>
-        </xsl:choose>
-    </xsl:variable>
-    <div class="{local-name()}">
-        <div class="noteicon" dir="auto"><img src="{$imgsrc}" alt="{local-name()}" style="{$iconsizestyle}"/></div>
-        <div class="notetext"><p id="{@id}" dir="auto"><xsl:apply-templates mode="embedded"/></p></div>
-    </div>
-    <br/>
+    <xsl:call-template name="insertnote">
+        <xsl:with-param name="type" select="local-name()" />
+    </xsl:call-template>
 </xsl:template>
 
 <!--SQLCODE, BASCODE, PYCODE-->
@@ -858,6 +861,15 @@
         <pre dir="auto"><code class="{$codelangclass}"><xsl:apply-templates /></code></pre>
     </div>
 </xsl:template>
+
+<!-- DESCRIPTION -->
+<xsl:template match="description">
+    <p id="{@id}" class="description" dir="auto"><xsl:apply-templates /></p>
+</xsl:template>
+<xsl:template match="description" mode="embedded">
+    <p id="{@id}" class="description" dir="auto"><xsl:apply-templates /></p>
+</xsl:template>
+
 <!-- In case of missing help files -->
 <xsl:template match="help-id-missing">
 <span id="bm_HID2"></span>

help3xsl/xap_templ_query.xsl

@@ -148,7 +148,7 @@ $if{$suggestion,]]><xsl:apply-templates select="//variable[@id='xap_didyoumean']
 
 $or{$html{$error},
 $if{$eq{$msize,0},
-$if{$query,]]><xsl:apply-templates select="//variable[@id='xap_no_match']"/><![CDATA[,
+$if{$query$.]]><xsl:apply-templates select="//variable[@id='xap_no_match']"/><![CDATA[,
 <hr>]]><xsl:apply-templates select="//variable[@id='xap_searching_doc']"/><![CDATA[
 },
 $if{$not{$msizeexact},
@@ -188,7 +188,7 @@ $if{$field{size},<span title="$html{$field{size}} bytes">]]><xsl:apply-templates
 <a href="$html{$field{url}}">$html{$prettyurl{$field{url}}}</a><br>
 <small>
 ]]><xsl:apply-templates select="//variable[@id='xap_matching']"/><![CDATA[
-<i>$list{$map{$terms,$html{$prettyterm{$_}}},</i>$. <i>,</i> and <i>}</i></small>${for lynx:}<p></td></tr>}
+<i>$list{$map{$terms,$html{$prettyterm{$_}}},</i>$. <i>,</i> ]]><xsl:apply-templates select="//variable[@id='xap_and']"/><![CDATA[ <i>}</i></small>${for lynx:}<p></td></tr>}
 </table>
 
 <br><center>

helpers/xmlhelp.dtd

@@ -56,7 +56,7 @@ Version Nov 2018
 <!ELEMENT sqlcode (paragraph+)>
 
 
-<!ELEMENT body ( %hn; | section | paragraph | table | comment | bookmark | switch | embed | list | sort | %codeContent; | %noteContent;)*>
+<!ELEMENT body ( %hn; | section | paragraph | description | table | comment | bookmark | switch | embed | list | sort | %codeContent; | %noteContent;)*>
 
 <!ELEMENT bookmark (bookmark_value)*>
 <!ATTLIST bookmark
@@ -210,7 +210,7 @@ Version Nov 2018
   %commonAttrs;
 >
 
-<!ELEMENT section (section | %hn; | paragraph | table | list | comment | bookmark | embed | switch | sort | %codeContent; | %noteContent;)*>
+<!ELEMENT section (section | %hn; | paragraph | description | table | list | comment | bookmark | embed | switch | sort | %codeContent; | %noteContent;)*>
 <!ATTLIST section
   id CDATA #REQUIRED
 >
@@ -298,4 +298,9 @@ Version Nov 2018
   %commonAttrs;
 >
 
+<!ELEMENT description (%paraContent;)*>
+<!ATTLIST description
+  l10n CDATA #IMPLIED
+  %commonAttrs;
+>
 <!ELEMENT help-id-missing EMPTY>

lohgerrit

@@ -0,0 +1,265 @@
+#!/usr/bin/env bash
+
+#GERRITHOST=gerrit.libreoffice.org
+GERRITHOST=logerrit
+GERRITURL="ssh://$GERRITHOST/help"
+
+get_SHA_for_change() {
+    SHA=$(ssh "${GERRITHOST?}" gerrit query --all-approvals change:"$1" | grep ref | tail -1 | cut -d: -f2 | sed 's/^ *//')
+}
+
+branch_or_default() {
+    local branch=$1
+    if test -z "${branch}"; then
+        # Try to use the tracked branch
+        branch=$(git symbolic-ref HEAD|sed 's|refs/heads/||')
+        local remote=$(git config branch.${branch}.remote)
+        branch=$(git rev-parse --abbrev-ref --symbolic-full-name HEAD@{upstream}|sed "s|${remote}/||")
+        if test -z "$branch"; then
+            branch=$(git symbolic-ref HEAD 2> /dev/null)
+            branch="${branch##refs/heads/}"
+            if test -z "${branch}"; then
+                echo >&2 "no branch specified, and could not guess the current branch"
+                exit 1
+            fi
+            echo >&2 "no branch specified, guessing current branch ${branch}"
+        else
+            echo >&2 "no branch specified, guessing tracked branch ${branch}"
+        fi
+    fi
+    echo "${branch}"
+}
+
+lohgerrit() {
+    echo "Host logerrit gerrit.libreoffice.org"
+    if test -n "${2-}" && test -f "$HOME/.ssh/id_$2"; then
+        echo "    IdentityFile ~/.ssh/id_$2"
+    fi
+    echo "    User $1"
+    echo "    Port 29418"
+    echo "    HostName gerrit.libreoffice.org"
+}
+
+case "$1" in
+    help|--help|"")
+        echo "Usage: ./logerrit subcommand [options]"
+        echo "simple and basic tool to interact with LibreOffice gerrit"
+        echo "see https://wiki.documentfoundation.org/Development/gerrit for details."
+        echo
+        echo "subcommands:"
+        echo "             setup                   walking you though your gerrit setup"
+        echo "             test                    test your gerrit setup"
+        echo
+        echo " --- for submitters:"
+        echo "             submit [BRANCH]         submit your change for review"
+        echo "             submit [BRANCH]%private submit your change as private"
+        echo "             submit [BRANCH]%wip     submit your change as work-in-progress"
+        echo "             nextchange [BRANCH]     reset branch to the remote to start with the next change"
+        echo "             testfeature [BRANCH] [CHANGEID]"
+        echo "                                     trigger a test of a feature branch on gerrit"
+        echo
+        echo "Note: private changes are only visibly to yourself and those that you explicitly add as reviewers."
+        echo "For full documentation, see https://gerrit.libreoffice.org/Documentation/intro-user.html#private-changes"
+        echo
+        echo " --- for reviewers:"
+        echo "             checkout CHANGEID       checkout the changes for review"
+        echo "             pull CHANGEID           pull (and merge) the changes on current branch"
+        echo "             cherry-pick CHANGEID    cherry-pick the change on current branch"
+        echo "             patch CHANGEID          show the change as a patch"
+        echo "             query ...               query for changes for review on project help"
+        echo "             <any other gerrit command>"
+        echo
+        echo "advanced users should consider using git review instead:"
+        echo "https://wiki.documentfoundation.org/Development/GitReview"
+        exit
+    ;;
+    setup)
+        script_canonical_file=$(readlink -f "$0")
+        script_canonical_dir=$(dirname "$script_canonical_file")
+        if ! cd "$script_canonical_dir"; then
+            echo "Can't cd to $script_canonical_dir"
+            exit 1
+        fi
+        ssh_home="$HOME/.ssh";
+        ssh_key=
+        created_ssh=
+        if ! test -d "$ssh_home"; then
+            echo "It appears that you have no ssh setup, running ssh-keygen to create that:"
+            mkdir -m0700 "$ssh_home"
+            created_ssh=TRUE
+            echo
+            echo "Hit enter to generate an ssh key - you will need to enter a pass-phrase"
+            echo
+            read -r
+            all_algo="$(ssh -Q key)"
+            if grep -q -x ssh-ed25519 <<< "$all_algo"; then
+                algo="ed25519"
+            elif grep -q -x ssh-rsa <<< "$all_algo"; then
+                algo="rsa"
+            else
+                echo "Could not find 'ssh-ed25519' or 'ssh-rsa' in the output from 'ssh -Q key'"
+                exit 1
+            fi
+            ssh-keygen -t "$algo" # Generate the key pair using the selected algorithm
+        fi
+        if test -d "$ssh_home"; then
+            # order algos based on the PubkeyAcceptedKeyTypes option from OpenSSH 8.1
+            for ssh_key_type in ecdsa ed25519 rsa; do
+                pk="$ssh_home/id_${ssh_key_type}.pub"
+                ssh_key=""
+                if test -f "$pk" && ssh_key="$(< "$pk")" && test -n "$ssh_key"; then
+                    break
+                fi
+            done
+        fi
+        echo "Please go to https://gerrit.libreoffice.org/ and click the \"Sign in\" link"
+        echo "at the top right of the page. You'll be sent to our Single Sign-On portal"
+        echo "for authentication (create an account if needs be), and automatically"
+        echo "redirected back to gerrit afterwards."
+        echo
+        echo "Visit https://gerrit.libreoffice.org/settings/#SSHKeys and paste the public"
+        if test -z "$ssh_key"; then
+            echo "part of your SSH key in the 'New SSH key' form."
+        else
+            echo "key below in the 'New SSH key' form."
+            echo
+            printf '%s\n' "$ssh_key"
+            echo
+        fi
+        echo
+        echo "Note that you need to register additional email addresses, if you want to"
+        echo "commit from them. Each additional email address must be confirmed by"
+        echo "following the verification link sent to it."
+        echo
+        read -r -p 'Which user name did you choose? ' GERRITUSER
+        if test -z "$created_ssh"; then
+            echo
+            echo "Please now add the following to your ~/.ssh/config, creating the file if needed:"
+            echo
+            logerrit "$GERRITUSER" ${ssh_key:+"$ssh_key_type"}
+            echo
+        else
+        echo "Automatically creating your ssh config"
+        logerrit "$GERRITUSER" ${ssh_key:+"$ssh_key_type"} >"$ssh_home/config"
+        fi
+        # setup the remote properly ...
+        git config remote.origin.pushurl ssh://logerrit/help
+        echo "To see if your setup was successful, run './logerrit test' then."
+        # a good place to make sure the hooks are set up
+        ./g -z
+    ;;
+    test)
+        if test -n "$(ssh "$GERRITHOST" 2>&1|grep "Welcome to Gerrit Code Review")"; then
+            echo "Your gerrit setup was successful!"
+        else
+            echo "There seems to be trouble. Please have the output of:"
+            echo "ssh -vvvv $GERRITHOST"
+            echo "at hand when looking for help."
+        fi
+    ;;
+    submit)
+        BRANCH=$(branch_or_default $2)
+        TYPE=${3:+"%$3"}
+
+        if [ "$BRANCH" = "master" ]; then
+            WEEKOLDDATE=$(date --date="7 days ago" +%s 2> /dev/null)
+            if [ "$WEEKOLDDATE" = "" ]; then
+                WEEKOLDDATE=$(date -v-7d +%s) # BSD equivalent
+            fi
+            PARENTDATE=$(git show -s --format=%ct HEAD~1)
+            if [[ $PARENTDATE -lt $WEEKOLDDATE ]]; then
+                echo "Your branch is older than a week, do './g pull -r' and retry"
+                exit 1
+            fi
+        fi
+        git push "$GERRITURL" "HEAD:refs/for/$BRANCH$TYPE"
+    ;;
+    nextchange)
+        if test -n "$(git status -s -uno)"; then
+            echo "You have uncommitted changes. Please commit or stash these:"
+            git status
+            exit 1
+        fi
+        CHANGEID=$(git log --format=format:%b -1 HEAD|grep Change-Id|cut -d: -f2|tr -d \ )
+        if test -z "$CHANGEID"; then
+            CHANGEID="NOCHANGEID"
+        fi
+        BACKUPBRANCH=backup/$CHANGEID-$(date +%F-%H%M%S)
+        git branch "$BACKUPBRANCH"
+        echo "current state backed up as $BACKUPBRANCH"
+        BRANCH=$(branch_or_default $2)
+        git reset --hard "remotes/origin/$BRANCH"
+    ;;
+    checkout)
+        get_SHA_for_change "$2"
+        git fetch "$GERRITURL" "$SHA" && git checkout FETCH_HEAD
+    ;;
+    review)
+        echo "'./logerrit review' has been removed as obsolete."
+        echo "Please use either:"
+        echo " - git-review:              https://wiki.documentfoundation.org/Development/GitReview"
+        echo " - or the web-UI directly:  https://gerrit.libreoffice.org/"
+        echo "Both provide a better experience."
+        exit 1;
+    ;;
+    pull)
+        get_SHA_for_change "$2"
+        git pull "$GERRITURL" "$SHA"
+    ;;
+    cherry-pick)
+        get_SHA_for_change "$2"
+        git fetch "$GERRITURL" "$SHA" && git cherry-pick FETCH_HEAD
+    ;;
+    patch)
+        get_SHA_for_change "$2"
+        git fetch "$GERRITURL" "$SHA" && git format-patch -1 --stdout FETCH_HEAD
+    ;;
+    query)
+        shift
+        ssh "${GERRITHOST?}" gerrit query project:help "${@@Q}"
+    ;;
+    testfeature)
+        CHANGEID=${3#I}
+        if test -n "$3" -a \( ${#3} -ne 41 -o -n "${CHANGEID//[0-9a-f]/}" \); then
+            echo "${3} is not a valid Gerrit change id"
+            exit 1
+        fi
+        CHANGEID=$3
+
+        BRANCH=$(branch_or_default $2)
+        BRANCH="${BRANCH##feature/}"
+        WORKDIR=$(mktemp -d)
+        if test -z "$WORKDIR"; then
+            echo "could not create work directory."
+            exit 1
+        fi
+        echo "workdir at $WORKDIR"
+        git clone -s "$(dirname "$0")" "$WORKDIR/help"
+
+        pushd "$WORKDIR/help" || { echo "Changing directory failed."; exit 1; }
+        echo "noop commit: trigger test build for branch feature/$BRANCH" > ../commitmsg
+        echo >> ../commitmsg
+        echo "branch is at:" >> ../commitmsg
+        echo >> ../commitmsg
+        git log -1|sed -e "s/Change-Id:/XXXXXX:/" >> ../commitmsg
+        if test -n "$CHANGEID"; then
+            echo >> ../commitmsg
+            echo "Change-Id: $CHANGEID" >> ../commitmsg
+        fi
+        git fetch https://git.libreoffice.org/help "feature/$BRANCH" && \
+            git checkout -b featuretst FETCH_HEAD && \
+            cp -a .git-hooks/* .git/hooks && \
+            git commit --allow-empty -F ../commitmsg && \
+            git push "$GERRITURL" "HEAD:refs/for/feature/$BRANCH"
+        popd || { echo "Changing directory failed."; exit 1; }
+
+        rm -rf "$WORKDIR/help"
+        rm -f "$WORKDIR/commitmsg"
+        rmdir "$WORKDIR"
+    ;;
+    *)
+        ssh "${GERRITHOST?}" gerrit "${@@Q}"
+    ;;
+esac
+
+# vim: set noet sw=4 ts=4:

source/auxiliary/scalc.tree

@@ -32,10 +32,10 @@
       <node id="080201" title="Menus">
         <topic id="scalc/text/scalc/main0100.xhp">Menus</topic>
         <topic id="shared/text/shared/menu/PickList.xhp">File</topic>
-        <topic id="scalc/text/scalc/main0102.xhp">Edit</topic>
+        <topic id="shared/text/shared/main_edit.xhp">Edit</topic>
         <topic id="scalc/text/shared/main0103.xhp">View</topic>
         <topic id="scalc/text/shared/main0104.xhp">Insert</topic>
-        <topic id="scalc/text/scalc/main0105.xhp">Format</topic>
+        <topic id="shared/text/shared/main_format.xhp">Format</topic>
         <topic id="scalc/text/scalc/main0116.xhp">Sheet</topic>
         <topic id="scalc/text/scalc/main0112.xhp">Data</topic>
         <topic id="scalc/text/shared/main_tools.xhp">Tools</topic>
@@ -175,6 +175,7 @@
     </node>
     <node id="0811" title="References">
       <topic id="scalc/text/scalc/guide/relativ_absolut_ref.xhp">Addresses and References, Absolute and Relative</topic>
+      <topic id="scalc/text/scalc/guide/r1c1syntax.xhp">R1C1 Reference Syntax</topic>
       <topic id="scalc/text/scalc/guide/cellreferences.xhp">Referencing a Cell in Another Document</topic>
       <topic id="scalc/text/scalc/guide/cellreferences_url.xhp">References to Other Sheets and Referencing URLs</topic>
       <topic id="scalc/text/scalc/guide/cellreference_dragdrop.xhp">Referencing Cells by Drag-and-Drop</topic>

source/auxiliary/sdraw.tree

@@ -20,10 +20,10 @@
       <node id="11020201" title="Menus">
         <topic id="sdraw/text/sdraw/main0100.xhp">Menus</topic>
         <topic id="shared/text/shared/menu/PickList.xhp">File</topic>
-        <topic id="sdraw/text/sdraw/main_edit.xhp">Edit</topic>
+        <topic id="shared/text/shared/main_edit.xhp">Edit</topic>
         <topic id="sdraw/text/shared/main0103.xhp">View</topic>
         <topic id="sdraw/text/sdraw/main_insert.xhp">Insert</topic>
-        <topic id="sdraw/text/sdraw/main_format.xhp">Format</topic>
+        <topic id="shared/text/shared/main_format.xhp">Format</topic>
         <topic id="sdraw/text/sdraw/main_page.xhp">Page</topic>
         <topic id="sdraw/text/sdraw/main_shape.xhp">Shape</topic>
         <topic id="sdraw/text/shared/main_tools.xhp">Tools</topic>

source/auxiliary/shared.tree

@@ -47,7 +47,7 @@
         <topic id="shared/text/shared/optionen/01010300.xhp">Paths</topic>
         <topic id="shared/text/shared/optionen/01010700.xhp">Fonts</topic>
         <topic id="shared/text/shared/optionen/01030300.xhp">Security</topic>
-        <topic id="shared/text/shared/optionen/01012000.xhp">Application Colors</topic>
+        <topic id="shared/text/shared/optionen/01012000.xhp">Appearance</topic>
         <topic id="shared/text/shared/optionen/java.xhp">Advanced</topic>
         <topic id="shared/text/shared/optionen/expertconfig.xhp">Expert Configuration</topic>
         <topic id="shared/text/shared/optionen/BasicIDE.xhp">Basic IDE</topic>
@@ -112,7 +112,7 @@
     <node id="1006" title="Configuring %PRODUCTNAME">
       <topic id="shared/text/shared/guide/configure_overview.xhp">Configuring %PRODUCTNAME</topic>
       <topic id="shared/text/shared/01/packagemanager.xhp">Extension Manager</topic>
-      <topic id="shared/text/shared/guide/flat_icons.xhp">Changing Icon Views</topic>
+      <topic id="shared/text/shared/optionen/01012000.xhp">Changing Icon Views</topic>
       <topic id="shared/text/shared/guide/edit_symbolbar.xhp">Adding Buttons to Toolbars </topic>
       <topic id="shared/text/shared/guide/workfolder.xhp">Changing Your Working Directory </topic>
       <topic id="shared/text/shared/guide/standard_template.xhp">Changing Default Templates</topic>

source/auxiliary/simpress.tree

@@ -30,10 +30,10 @@
       <node id="04020101" title="Menus">
         <topic id="simpress/text/simpress/main0100.xhp">Menus</topic>
         <topic id="shared/text/shared/menu/PickList.xhp">File</topic>
-        <topic id="simpress/text/simpress/main_edit.xhp">Edit</topic>
+        <topic id="shared/text/shared/main_edit.xhp">Edit</topic>
         <topic id="simpress/text/shared/main0103.xhp">View</topic>
         <topic id="simpress/text/shared/main0104.xhp">Insert</topic>
-        <topic id="simpress/text/simpress/main_format.xhp">Format</topic>
+        <topic id="shared/text/shared/main_format.xhp">Format</topic>
         <topic id="simpress/text/simpress/main_slide.xhp">Slide</topic>
         <topic id="simpress/text/simpress/main0114.xhp">Slide Show</topic>
         <topic id="simpress/text/shared/main_tools.xhp">Tools</topic>

source/auxiliary/swriter.tree

@@ -31,10 +31,10 @@
       <node id="020201" title="Menus">
         <topic id="swriter/text/swriter/main0100.xhp">Menus</topic>
         <topic id="shared/text/shared/menu/PickList.xhp">File</topic>
-        <topic id="swriter/text/swriter/main0102.xhp">Edit</topic>
+        <topic id="shared/text/shared/main_edit.xhp">Edit</topic>
         <topic id="swriter/text/shared/main0103.xhp">View</topic>
         <topic id="swriter/text/shared/main0104.xhp">Insert</topic>
-        <topic id="swriter/text/swriter/main0105.xhp">Format</topic>
+        <topic id="shared/text/shared/main_format.xhp">Format</topic>
         <topic id="shared/text/shared/menu/style_menu.xhp">Styles</topic>
         <topic id="swriter/text/swriter/main0110.xhp">Table</topic>
         <topic id="swriter/text/swriter/main0120.xhp">Form</topic>
@@ -213,6 +213,7 @@
     </node>
     <node id="0219" title="Loading, Saving, Importing, Exporting and Redacting">
       <topic id="swriter/text/swriter/guide/send2html.xhp">Saving Text Documents in HTML Format</topic>
+      <topic id="swriter/text/swriter/guide/markdown.xhp">Working with Text Documents in Markdown Format</topic>
       <topic id="swriter/text/swriter/guide/textdoc_inframe.xhp">Inserting an Entire Text Document</topic>
       <topic id="shared/text/shared/guide/redaction.xhp">Redacting a Text Document</topic>
       <topic id="shared/text/shared/guide/auto_redact.xhp">Automatic Redaction</topic>