[Libreoffice-commits] help.git: 2 commits - AllLangHelp_scalc.mk help3xsl/online_transform.xsl source/text
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Mar 4 14:42:40 UTC 2019
AllLangHelp_scalc.mk | 1
help3xsl/online_transform.xsl | 57 ++++++++----------------
source/text/scalc/00/avail_release.xhp | 76 +++++++++++++++++++++++++++++++++
source/text/scalc/01/func_regex.xhp | 1
4 files changed, 98 insertions(+), 37 deletions(-)
New commits:
commit 09003c0b3a18d448976e2264347ad3b80fc31994
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Mon Mar 4 10:18:35 2019 -0300
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Mon Mar 4 15:42:33 2019 +0100
tdf#123803 Add relelase info in Calc functions
Patch is for REGEX function available since release 6.2
To add release information to other functions look
at the diff in func_regex.xhp and adjust the release. It
should be straightforward:
<embed href="text/scalc/00/avail_release.xhp#M.N"/>
where M is version and N is release.
Patch tweaked to minimize translation effort (only one string)
Change-Id: I4f5f826c936e65c1050a4d3b71379b53d50e0984
Reviewed-on: https://gerrit.libreoffice.org/68688
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index d55d6abbf..6bdbc1e56 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
helpcontent2/source/text/scalc/00/00000407 \
helpcontent2/source/text/scalc/00/00000412 \
helpcontent2/source/text/scalc/00/sheet_menu \
+ helpcontent2/source/text/scalc/00/avail_release \
helpcontent2/source/text/scalc/01/01120000 \
helpcontent2/source/text/scalc/01/02110000 \
helpcontent2/source/text/scalc/01/02120000 \
diff --git a/source/text/scalc/00/avail_release.xhp b/source/text/scalc/00/avail_release.xhp
new file mode 100644
index 000000000..678817bc7
--- /dev/null
+++ b/source/text/scalc/00/avail_release.xhp
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+ <!--
+ * 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/.
+ *
+ -->
+
+ <meta>
+ <topic id="availablerelease" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Available since release</title>
+ <filename>/text/scalc/00/avail_release.xhp</filename>
+ </topic>
+ </meta>
+
+ <body>
+ <paragraph role="paragraph" id="par_id631551701603518"><variable id="release">This function is available since %PRODUCTNAME </variable></paragraph>
+ <section id="3.3">
+ <tip id="par_id651551701041690" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>3.3</tip>
+ </section>
+ <section id="3.4">
+ <tip id="par_id651551401041690" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>3.4</tip>
+ </section>
+ <section id="3.5">
+ <tip id="par_id651551401041635" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>3.5</tip>
+ </section>
+ <section id="3.6">
+ <tip id="par_id651551401041636" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>3.6</tip>
+ </section>
+ <section id="4.0">
+ <tip id="par_id651551401041640" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>4.0</tip>
+ </section>
+ <section id="4.1">
+ <tip id="par_id651551401041641" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>4.1</tip>
+ </section>
+ <section id="4.2">
+ <tip id="par_id651551401041642" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>4.2</tip>
+ </section>
+ <section id="4.3">
+ <tip id="par_id651551401041643" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>4.3</tip>
+ </section>
+ <section id="4.4">
+ <tip id="par_id651551401041644" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>4.4</tip>
+ </section>
+ <section id="5.0">
+ <tip id="par_id651551401041650" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>5.0</tip>
+ </section>
+ <section id="5.1">
+ <tip id="par_id651551401041651" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>5.1</tip>
+ </section>
+ <section id="5.2">
+ <tip id="par_id651551401041652" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>5.2</tip>
+ </section>
+ <section id="5.3">
+ <tip id="par_id651551401041653" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>5.3</tip>
+ </section>
+ <section id="5.4">
+ <tip id="par_id651551401041654" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>5.4</tip>
+ </section>
+ <section id="6.0">
+ <tip id="par_id651551401041660" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>6.0</tip>
+ </section>
+ <section id="6.1">
+ <tip id="par_id651551401041661" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>6.1</tip>
+ </section>
+ <section id="6.2">
+ <tip id="par_id651551401041662" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>6.2</tip>
+ </section>
+ <section id="6.3">
+ <tip id="par_id651551401041663" localize="false"><embedvar href="text/scalc/00/avail_release.xhp#release" markup="ignore"/>6.3</tip>
+ </section>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/func_regex.xhp b/source/text/scalc/01/func_regex.xhp
index c733abc95..f0b497dd1 100644
--- a/source/text/scalc/01/func_regex.xhp
+++ b/source/text/scalc/01/func_regex.xhp
@@ -26,6 +26,7 @@
<paragraph id="hd_id961542230672100" role="heading" level="1" xml-lang="en-US"><link href="text/scalc/01/func_regex.xhp" name="function REGEX">REGEX</link></paragraph>
<paragraph id="par_id541542230672101" role="paragraph" xml-lang="en-US"><variable id="func_regex_desc"><ahelp hid=".">Matches and extracts or optionally replaces text using regular expressions.</ahelp></variable></paragraph>
</section>
+ <embed href="text/scalc/00/avail_release.xhp#6.2"/>
<embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
<paragraph role="code" id="par_id701542231253817" xml-lang="en-US">REGEX( Text ; Expression [ ; [ Replacement ] [ ; Flags|Occurrence ] ] )</paragraph>
<paragraph role="paragraph" id="par_id621542232197446" xml-lang="en-US"><emph>Text</emph>: A text or reference to a cell where the regular expression is to be applied.</paragraph>
commit fd16b597ba43092b77dd6c3dadbaddafa4e420ed
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Sun Mar 3 14:26:28 2019 -0300
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Mon Mar 4 15:42:18 2019 +0100
Some optimizing bits in XSLT
Change-Id: I27c29677cbf9c704d64b5ed49acc56b7a22432bd
Reviewed-on: https://gerrit.libreoffice.org/68646
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 03b20f708..6cb2c7888 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -167,7 +167,7 @@
<div class="header-extrawurst">
<header>
<div class="logo-container">
- <a class="logo" href="{$target}{$lang}/text/shared/05/new_help.html">
+ <a class="logo" href="{$target}{$lang}/text/shared/05/new_help.html">
<div class="symbol"></div>
<p><xsl:value-of select="$ui_logo"/></p>
</a>
@@ -231,8 +231,6 @@
</script>
<xsl:text disable-output-escaping="yes"><gcse:search></gcse:search></xsl:text>
</div>
- </xsl:if>
- <xsl:if test="$online">
<div class="donation">
<p><a href="https://www.libreoffice.org/donate/?pk_campaign=help" target ="_blank">
<xsl:value-of select="$ui_donate"/>
@@ -253,40 +251,25 @@
<script type="text/javascript" src="{$target}{$lang}/bookmarks.js"/>
<script type="text/javascript" src="{$target}{$lang}/contents.js"/>
<script type="text/javascript" src="{$target}help.js"/>
- <xsl:choose>
- <xsl:when test="$online">
- <script type="text/javascript">
- <![CDATA[
- var module = getParameterByName("DbPAR");
- var system = getParameterByName("System");
- var helpID = getParameterByName("HID");
- fixURL(module,system);
- var dbg = getParameterByName("Debug");
- if (dbg == null){dbg=0}
- document.getElementById("DEBUG").style.display = (dbg == 0) ? "none":"block";
- document.getElementById("bm_module").innerHTML ="Module is: "+module;
- document.getElementById("bm_system").innerHTML ="System is: "+system;
- document.getElementById("bm_HID").innerHTML ="HID is: "+helpID;
- ]]>
- </script>
- </xsl:when>
- <xsl:otherwise>
- <script type="text/javascript">
- <![CDATA[
- var module = getParameterByName("DbPAR");
- var helpID = getParameterByName("HID");
- var system = getSystem();
- fixURL(module,system);
- var dbg = getParameterByName("Debug");
- if (dbg == null){dbg=0}
- document.getElementById("DEBUG").style.display = (dbg == 0) ? "none":"block";
- document.getElementById("bm_module").innerHTML ="Module is: "+module;
- document.getElementById("bm_system").innerHTML ="System is: "+system;
- document.getElementById("bm_HID").innerHTML ="HID is: "+helpID;
- ]]>
- </script>
- </xsl:otherwise>
- </xsl:choose>
+ <script type="text/javascript">
+ <![CDATA[
+ var module = getParameterByName("DbPAR");
+ var helpID = getParameterByName("HID");
+ ]]>
+ <xsl:choose>
+ <xsl:when test="$online"><![CDATA[var system = getParameterByName("System");]]></xsl:when>
+ <xsl:otherwise><![CDATA[var system = getSystem();]]></xsl:otherwise>
+ </xsl:choose>
+ <![CDATA[
+ fixURL(module,system);
+ var dbg = getParameterByName("Debug");
+ if (dbg == null){dbg=0}
+ document.getElementById("DEBUG").style.display = (dbg == 0) ? "none":"block";
+ document.getElementById("bm_module").innerHTML ="Module is: "+module;
+ document.getElementById("bm_system").innerHTML ="System is: "+system;
+ document.getElementById("bm_HID").innerHTML ="HID is: "+helpID;
+ ]]>
+ </script>
<xsl:if test="$online">
<!-- Piwik -->
<script type="text/javascript">
More information about the Libreoffice-commits
mailing list