From 80cfa06de7bb382c30ead55837378dcd568d2e30 Mon Sep 17 00:00:00 2001
From: Alain Romedenne <alain.romedenne@libreoffice.org>
Date: Thu, 25 Jul 2024 17:13:26 +0200
Subject: [PATCH] tdf#161883 Fix to IF Basic statement syntax diagram

Change-Id: Idcd12d05cd424360cd29bbb7cd7ee73e766bef52
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171025
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Jenkins
---
 Package_html_media.mk                         |   1 -
 .../media/helpimg/sbasic/ElseIf_fragment.svg  |  42 ------
 source/media/helpimg/sbasic/If_statement.svg  | 126 +++++++++++++++---
 source/text/sbasic/shared/03090101.xhp        |   7 +-
 4 files changed, 109 insertions(+), 67 deletions(-)
 delete mode 100644 source/media/helpimg/sbasic/ElseIf_fragment.svg

diff --git a/Package_html_media.mk b/Package_html_media.mk
index a9153bcd55..357e38736f 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -144,7 +144,6 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     helpimg/sbasic/Do_statement.svg \
     helpimg/sbasic/Do-Loop_statement.svg \
     helpimg/sbasic/Else_fragment.svg \
-    helpimg/sbasic/ElseIf_fragment.svg \
     helpimg/sbasic/Enum_statement.svg \
     helpimg/sbasic/Erase_statement.svg \
     helpimg/sbasic/For-Each_statement.svg \
diff --git a/source/media/helpimg/sbasic/ElseIf_fragment.svg b/source/media/helpimg/sbasic/ElseIf_fragment.svg
deleted file mode 100644
index 49759d4412..0000000000
--- a/source/media/helpimg/sbasic/ElseIf_fragment.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<svg class="railroad-diagram" height="144" viewBox="0 0 623.5 144" width="623.5" xmlns="http://www.w3.org/2000/svg">
-<g transform="translate(.5 .5)">
-<style>/* <![CDATA[ */
-    svg.railroad-diagram {
-        background-color:transparent;
-    }
-    svg.railroad-diagram path {
-        stroke-width:1;
-        stroke:black;
-        fill:rgba(0,0,0,0);
-    }
-    svg.railroad-diagram text {
-        font:bold 14px monospace;
-        font-family: Verdana, sans-serif;
-        text-anchor:middle;
-    }
-    svg.railroad-diagram text.label{
-        text-anchor:start;
-    }
-    svg.railroad-diagram text.comment{
-        font:italic 12px monospace;
-    }
-    svg.railroad-diagram rect{
-        stroke-width:1;
-        stroke:black;
-        fill:transparent;
-    }
-
-/* ]]> */
-</style><g>
-<path d="M20 41v20m0 -10h20"></path></g><g>
-<path d="M40 51h0.0"></path><path d="M583.5 51h0.0"></path><path d="M40.0 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
-<path d="M70.0 20h483.5"></path></g><path d="M553.5 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M40.0 51h30"></path><g>
-<path d="M70.0 51h0.0"></path><path d="M553.5 51h0.0"></path><path d="M70.0 51h15"></path><g>
-<path d="M85.0 51h0.0"></path><path d="M538.5 51h0.0"></path><g>
-<path d="M85.0 51h0.0"></path><path d="M224.5 51h0.0"></path><path d="M85.0 51h30"></path><g class="terminal">
-<path d="M115.0 51h4.25"></path><path d="M190.25 51h4.25"></path><rect height="22" rx="10" ry="10" width="71.0" x="119.25" y="40"></rect><text x="154.75" y="55">ElseIf</text></g><path d="M194.5 51h30"></path><path d="M85.0 51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M115.0 93h0.0"></path><path d="M194.5 93h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="115.0" y="82"></rect><text x="154.75" y="97">Else If</text></g><path d="M194.5 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path></g><path d="M224.5 51h10"></path><g class="terminal">
-<path d="M234.5 51h0.0"></path><path d="M339.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="105.0" x="234.5" y="40"></rect><text x="287.0" y="55">expression</text></g><path d="M339.5 51h10"></path><path d="M349.5 51h10"></path><g class="terminal">
-<path d="M359.5 51h0.0"></path><path d="M413.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="359.5" y="40"></rect><text x="386.5" y="55">Then</text></g><path d="M413.5 51h10"></path><path d="M423.5 51h10"></path><g class="terminal">
-<path d="M433.5 51h0.0"></path><path d="M538.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="105.0" x="433.5" y="40"></rect><text x="486.0" y="55">statements</text></g></g><path d="M538.5 51h15"></path><path d="M85.0 51a15 15 0 0 0 -15 15v43a15 15 0 0 0 15 15"></path><g>
-<path d="M85.0 124h453.5"></path></g><path d="M538.5 124a15 15 0 0 0 15 -15v-43a15 15 0 0 0 -15 -15"></path></g><path d="M553.5 51h30"></path></g><path d="M 583.5 51 h 20 m 0 -10 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/If_statement.svg b/source/media/helpimg/sbasic/If_statement.svg
index cd37c12b5d..c7a41b1bee 100644
--- a/source/media/helpimg/sbasic/If_statement.svg
+++ b/source/media/helpimg/sbasic/If_statement.svg
@@ -1,6 +1,109 @@
-<svg class="railroad-diagram" height="124" viewBox="0 0 825.5 124" width="825.5" xmlns="http://www.w3.org/2000/svg">
+<svg class="railroad-diagram" width="764" height="101" viewBox="0 0 764 101" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g transform="translate(.5 .5)">
-<style>/* <![CDATA[ */
+<g>
+<path d="M20 30v20m10 -20v20m-10 -10h20"></path>
+</g>
+<path d="M40 40h10"></path>
+<g class="terminal ">
+<path d="M50 40h0"></path>
+<path d="M86 40h0"></path>
+<rect x="50" y="29" width="36" height="22" rx="10" ry="10"></rect>
+<text x="68" y="44">If</text>
+</g>
+<path d="M86 40h10"></path>
+<path d="M96 40h10"></path>
+<g>
+<path d="M106 40h0"></path>
+<path d="M410 40h0"></path>
+<path d="M106 40h10"></path>
+<g>
+<path d="M116 40h0"></path>
+<path d="M400 40h0"></path>
+<g class="terminal ">
+<path d="M116 40h0"></path>
+<path d="M208 40h0"></path>
+<rect x="116" y="29" width="92" height="22" rx="10" ry="10"></rect>
+<text x="162" y="44">condition</text>
+</g>
+<path d="M208 40h10"></path>
+<path d="M218 40h10"></path>
+<g class="terminal ">
+<path d="M228 40h0"></path>
+<path d="M280 40h0"></path>
+<rect x="228" y="29" width="52" height="22" rx="10" ry="10"></rect>
+<text x="254" y="44">Then</text>
+</g>
+<path d="M280 40h10"></path>
+<path d="M290 40h10"></path>
+<g class="terminal ">
+<path d="M300 40h0"></path>
+<path d="M400 40h0"></path>
+<rect x="300" y="29" width="100" height="22" rx="10" ry="10"></rect>
+<text x="350" y="44">statements</text>
+</g>
+</g>
+<path d="M400 40h10"></path>
+<path d="M116 40a10 10 0 0 0 -10 10v10a10 10 0 0 0 10 10"></path>
+<g class="terminal ">
+<path d="M116 70h108"></path>
+<path d="M292 70h108"></path>
+<rect x="224" y="59" width="68" height="22" rx="10" ry="10"></rect>
+<text x="258" y="74">ElseIf</text>
+</g>
+<path d="M400 70a10 10 0 0 0 10 -10v-10a10 10 0 0 0 -10 -10"></path>
+</g>
+<path d="M410 40h10"></path>
+<g>
+<path d="M420 40h0"></path>
+<path d="M576 40h0"></path>
+<path d="M420 40h20"></path>
+<g>
+<path d="M440 40h116"></path>
+</g>
+<path d="M556 40h20"></path>
+<path d="M420 40a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path>
+<g class="non-terminal ">
+<path d="M440 60h0"></path>
+<path d="M556 60h0"></path>
+<rect x="440" y="49" width="116" height="22"></rect>
+<text x="498" y="64">Else options</text>
+</g>
+<path d="M556 60a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path>
+</g>
+<g>
+<path d="M576 40h0"></path>
+<path d="M724 40h0"></path>
+<path d="M576 40a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path>
+<g>
+<path d="M596 20h108"></path>
+</g>
+<path d="M704 20a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path>
+<path d="M576 40h20"></path>
+<g>
+<path d="M596 40h0"></path>
+<path d="M704 40h0"></path>
+<path d="M596 40h20"></path>
+<g class="terminal ">
+<path d="M616 40h4"></path>
+<path d="M680 40h4"></path>
+<rect x="620" y="29" width="60" height="22" rx="10" ry="10"></rect>
+<text x="650" y="44">EndIf</text>
+</g>
+<path d="M684 40h20"></path>
+<path d="M596 40a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
+<g class="terminal ">
+<path d="M616 70h0"></path>
+<path d="M684 70h0"></path>
+<rect x="616" y="59" width="68" height="22" rx="10" ry="10"></rect>
+<text x="650" y="74">End If</text>
+</g>
+<path d="M684 70a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
+</g>
+<path d="M704 40h20"></path>
+</g>
+<path d="M 724 40 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
+</g>
+<style>
     svg.railroad-diagram {
         background-color:transparent;
     }
@@ -24,20 +127,5 @@
         stroke-width:1;
         stroke:black;
         fill:transparent;
-    }
-
-/* ]]> */
-</style><g>
-<path d="M20 41v20m10 -20v20m-10 -10h20"></path></g><path d="M40 51h10"></path><g class="terminal">
-<path d="M50 51h0.0"></path><path d="M87.0 51h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="50.0" y="40"></rect><text x="68.5" y="55">If</text></g><path d="M87.0 51h10"></path><path d="M97.0 51h10"></path><g class="terminal">
-<path d="M107.0 51h0.0"></path><path d="M203.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="96.5" x="107.0" y="40"></rect><text x="155.25" y="55">condition</text></g><path d="M203.5 51h10"></path><path d="M213.5 51h10"></path><g class="terminal">
-<path d="M223.5 51h0.0"></path><path d="M277.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="223.5" y="40"></rect><text x="250.5" y="55">Then</text></g><path d="M277.5 51h10"></path><path d="M287.5 51h10"></path><g class="terminal">
-<path d="M297.5 51h0.0"></path><path d="M402.5 51h0.0"></path><rect height="22" rx="10" ry="10" width="105.0" x="297.5" y="40"></rect><text x="350.0" y="55">statements</text></g><path d="M402.5 51h10"></path><g>
-<path d="M412.5 51h0.0"></path><path d="M594.5 51h0.0"></path><path d="M412.5 51h30"></path><g>
-<path d="M442.5 51h122.0"></path></g><path d="M564.5 51h30"></path><path d="M412.5 51a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><g class="non-terminal">
-<path d="M442.5 82h0.0"></path><path d="M564.5 82h0.0"></path><rect height="22" width="122.0" x="442.5" y="71"></rect><text x="503.5" y="86">Else options</text></g><path d="M564.5 82a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path></g><g>
-<path d="M594.5 51h0.0"></path><path d="M785.5 51h0.0"></path><path d="M594.5 51a15 15 0 0 0 15 -15v-1a15 15 0 0 1 15 -15"></path><g>
-<path d="M624.5 20h131.0"></path></g><path d="M755.5 20a15 15 0 0 1 15 15v1a15 15 0 0 0 15 15"></path><path d="M594.5 51h30"></path><g>
-<path d="M624.5 51h0.0"></path><path d="M755.5 51h0.0"></path><path d="M624.5 51h30"></path><g class="terminal">
-<path d="M654.5 51h4.25"></path><path d="M721.25 51h4.25"></path><rect height="22" rx="10" ry="10" width="62.5" x="658.75" y="40"></rect><text x="690.0" y="55">EndIf</text></g><path d="M725.5 51h30"></path><path d="M624.5 51a15 15 0 0 1 15 15v12a15 15 0 0 0 15 15"></path><g class="terminal">
-<path d="M654.5 93h0.0"></path><path d="M725.5 93h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="654.5" y="82"></rect><text x="690.0" y="97">End If</text></g><path d="M725.5 93a15 15 0 0 0 15 -15v-12a15 15 0 0 1 15 -15"></path></g><path d="M755.5 51h30"></path></g><path d="M 785.5 51 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
+    }</style>
+</svg>
diff --git a/source/text/sbasic/shared/03090101.xhp b/source/text/sbasic/shared/03090101.xhp
index ff354e386e..f2e700c971 100644
--- a/source/text/sbasic/shared/03090101.xhp
+++ b/source/text/sbasic/shared/03090101.xhp
@@ -31,8 +31,6 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154422">
   <bookmark_value>If statement</bookmark_value>
   <bookmark_value>ElseIf; If statement</bookmark_value>
-  <bookmark_value>Else If;If statement</bookmark_value>
-  <bookmark_value>Else;If statement</bookmark_value>
   <bookmark_value>Else;If statement</bookmark_value>
   <bookmark_value>End If;If statement</bookmark_value>
   <bookmark_value>EndIf;If statement</bookmark_value>
@@ -44,19 +42,18 @@
 
 <embed href="text/sbasic/shared/00000003.xhp#functsyntax"/>
 <paragraph role="image" id="par_id311592320434736"><image src="media/helpimg/sbasic/If_statement.svg" id="img_id601592320434736"><alt id="alt_id551592320434736">If...EndIf statement</alt></image></paragraph>
-<paragraph role="image" id="par_id591592320435808"><image src="media/helpimg/sbasic/ElseIf_fragment.svg" id="img_id691592320435808"><alt id="alt_id341592320435808">ElseIf fragment</alt></image></paragraph>
 <paragraph role="image" id="par_id221592320436632"><image src="media/helpimg/sbasic/Else_fragment.svg" id="img_id81592320436632"><alt id="alt_id391592320436632">Else fragment</alt></image></paragraph>
 
 <bascode>
   <paragraph id="par_id3153126" role="bascode" localize="false">If condition Then </paragraph>
   <paragraph role="bascode" id="bas_id801592319803093" localize="false">    statements</paragraph>
-  <paragraph role="bascode" id="bas_id561592319637952" localize="false">[{ElseIf|Else If} expression Then</paragraph>
+  <paragraph role="bascode" id="bas_id561592319637952" localize="false">[{ElseIf} condition Then</paragraph>
   <paragraph role="bascode" id="bas_id31592419640235" localize="false">    statements]</paragraph>
   <paragraph role="bascode" id="bas_id561692319637952" localize="false">[Else </paragraph>
   <paragraph role="bascode" id="bas_id31592319640235" localize="false">    statements]</paragraph>
   <paragraph role="bascode" id="bas_id861592319641899" localize="false">{EndIf|End If}</paragraph>
 </bascode>
-  <paragraph id="par_id3123476" role="paragraph" xml-lang="en-US">Instead of <emph>Else If</emph> you can write <emph>ElseIf</emph>, instead of <emph>End If</emph> you can write <emph>EndIf</emph>.</paragraph>
+  <paragraph id="par_id3123476" role="paragraph" xml-lang="en-US">Instead of <emph>End If</emph> you can write <emph>EndIf</emph>.</paragraph>
   <tip id="par_id631592322239043"><emph>If</emph> statements can be shortened to one line when using single statement blocks.</tip>
 <bascode>
   <paragraph role="bascode" id="bas_id771592321093694" localize="false">If condition Then statement [Else statement]</paragraph>