Revert "ScriptForge case-sensitive keys in the Dictionary service"

This reverts commit 4331489799ca3e2e1a0dbbd295f138620f2b136e.

Reason for revert: Breaks string freeze.

Change-Id: I93dccbd129dd6dba6e2c7e33e117bbf4c05e0a86
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/195240
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

AllLangHelp_scalc.mk

@@ -113,6 +113,7 @@ $(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 \
@@ -221,7 +222,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     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 \
@@ -234,7 +234,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     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 \
@@ -263,7 +262,6 @@ $(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 \
@@ -467,7 +465,6 @@ $(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 \
@@ -490,7 +487,6 @@ $(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 \

AllLangHelp_shared.mk

@@ -362,7 +362,6 @@ $(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 \
@@ -767,6 +766,7 @@ $(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 \

AllLangHelp_simpress.mk

@@ -77,6 +77,7 @@ $(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 \
@@ -107,7 +108,6 @@ $(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 \

AllLangHelp_swriter.mk

@@ -145,6 +145,7 @@ $(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 \
@@ -163,7 +164,6 @@ $(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 \
@@ -344,7 +344,6 @@ $(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 \

AllLangPackage_html_media_lang.mk

@@ -263,6 +263,7 @@ $(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 = $(sort $(subst helpcontent2/source/text/,,$(foreach module,$(html_TEXT_MODULES),$(gb_AllLangHelp_$(module)_HELPFILES))))
+gb_html_allhelpfiles = $(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)),$(gb_html_allhelpfiles)$(if $(filter WNT,$(OS)), ))  && \
+		RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst helpcontent2/source/text/,,$(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,15 +58,19 @@ $(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)
@@ -79,19 +83,27 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/xap_tpl : \
 		--stringparam productversion "$(PRODUCTVERSION)" \
 		-o $@ \
 		$(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \
-		$(gb_HelpTranslatePartTarget_workdir)/$*/helpcontent2/source/text/shared/help/browserhelp.xhp \
+		$(if $(filter en-US,$*),$(SRCDIR),$(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
-	$(file >$@,var languagesSet = new Set([$(subst $(WHITESPACE),$(COMMA) ,$(patsubst %,'%',$(gb_HELP_LANGS)))]);)
+$(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))))
 
 # 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 = {' ; \
@@ -179,9 +191,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 $(dir $(gb_html_allhelpfiles))) \
+	rm -rf $(dir $@)text && mkdir -p $(dir $@)text && cd $(dir $@)text && mkdir -p $(sort $(subst helpcontent2/source/text/,,$(dir $(gb_html_allhelpfiles)))) \
 	&& cd $(if $(filter en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*) \
-	&& RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(addsuffix $(WHITESPACE)dummyIgnoreCRinEOL$(NEWLINE),$(gb_html_allhelpfiles))) \
+	&& RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(addsuffix $(WHITESPACE)dummyIgnoreCRinEOL$(NEWLINE),$(subst helpcontent2/source/,,$(gb_html_allhelpfiles)))) \
 	&& while read xhp dummy; do \
 	    $(call gb_ExternalExecutable_get_command,xsltproc) \
 	        --stringparam Language $* \
@@ -190,9 +202,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 $@)/text/$${xhp%.xhp}.html \
+	        -o $(dir $@)$${xhp%.xhp}.html \
 	        $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/online_transform.xsl \
-	        helpcontent2/source/text/$$xhp \
+	        helpcontent2/source/$$xhp \
 	    || exit \
 	; done <"$$RESPONSEFILE" \
 	&& rm "$$RESPONSEFILE" \

Package_html_media.mk

@@ -51,7 +51,6 @@ $(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 \
@@ -96,7 +95,6 @@ $(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 \
@@ -179,12 +177,10 @@ $(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 \
@@ -377,7 +373,6 @@ $(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 \
@@ -444,6 +439,7 @@ $(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,7 +57,6 @@ h4,
 h5,
 h6,
 .listitem,
-.description,
 .listitemintable,
 .tablecontent {
     font-family: var(--font-body);
@@ -150,8 +149,6 @@ img[src$=".svg"] {
 }
 .literal {
     white-space: normal;
-    word-break: keep-all;
-    overflow-wrap: break-word;
 }
 .smathcode {
     border-radius: 2px;
@@ -171,7 +168,6 @@ img[src$=".svg"] {
 }
 .keycode {
     font-family: var(--font-mono);
-    font-style:italic;
 }
 .widget {
     padding: 1px 10px;
@@ -706,11 +702,10 @@ li.disabled a {
 .donation {
     border: 1px solid #f1c62a;
     border-radius: 2px;
-    padding: 5px 10px;
+    padding: 10px;
     margin: 5px 10px;
     max-width: 200px;
     color: white;
-    align-items:center;
 }
 .donation:hover {
     background: linear-gradient(90deg, #1c71d8 0%, #30c877 100%);

help3xsl/online_transform.xsl

@@ -92,7 +92,6 @@
 <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>
@@ -123,9 +122,7 @@
 
 <!-- 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>
@@ -150,24 +147,14 @@
             </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"/>
@@ -191,7 +178,6 @@
         <xsl:if test="//topic[@indexer='exclude']">
             <meta name="robots" content="noindex"/>
         </xsl:if>
-
     </head>
     <body>
 
@@ -276,18 +262,12 @@
         <xsl:apply-templates select="/helpdocument/body"/>
     </div>
     <div id="DonationFrame">
-        <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}"/>
+        <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>
             </div>
-            <div class="iconcell">
-                <p dir="auto"><xsl:value-of select="$ui_donate"/></p>
-            </div>
-        </div>
-        </a>
+        </xsl:if>
     </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;">
@@ -822,16 +802,33 @@
 </xsl:template>
 
 <!--NOTE TIP AND WARNING-->
-
 <xsl:template match="tip | note | warning">
-    <xsl:call-template name="insertnote">
-        <xsl:with-param name="type" select="local-name()" />
-    </xsl:call-template>
+    <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:template>
 <xsl:template match="tip | note | warning" mode="embedded">
-    <xsl:call-template name="insertnote">
-        <xsl:with-param name="type" select="local-name()" />
-    </xsl:call-template>
+    <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:template>
 
 <!--SQLCODE, BASCODE, PYCODE-->
@@ -861,15 +858,6 @@
         <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>

helpers/xmlhelp.dtd

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

lohgerrit

@@ -1,265 +0,0 @@
-#!/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

@@ -175,7 +175,6 @@
     </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/shared.tree

@@ -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/optionen/01012000.xhp">Changing Icon Views</topic>
+      <topic id="shared/text/shared/guide/flat_icons.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/swriter.tree

@@ -213,7 +213,6 @@
     </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>