[Libreoffice-commits] help.git: Package_html_media.mk source/media source/text
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Feb 25 16:29:13 UTC 2019
Package_html_media.mk | 1
source/media/helpimg/scalc/coordinates-to-polar-01.svg | 80 +++++++++++++++++
source/text/scalc/01/04060106.xhp | 23 +++-
3 files changed, 97 insertions(+), 7 deletions(-)
New commits:
commit 3efabd3e5e7ac30a81de5f286f6c9c5a3327effb
Author: Mark <mark_r80 at hotmail.com>
AuthorDate: Sun Feb 10 07:45:19 2019 -0800
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Mon Feb 25 17:28:49 2019 +0100
tdf#123192 - Improve help for function ATAN2
updated text in ATAN2 section of 04060106.xhp
added coordinates-to-polar-01.svg
changed example and image
removed 'Important!', added 'radians'
changed 'LibreOffice' to '%PRODUCTNAME'
created new folder 'scalc' under 'media/helpimg/'
moved coordinates-to-polar-01.svg to new folder
and added the path/image name to Package_html_media.mk
droped xml-lang="en-US" tag, removed 'Note',
removed '<pre>' tag, did not add <embed> as
Jenkins rejects it.
Change-Id: I5cff6289e8ab25f511e7d31ba2d4ad733dea184a
Reviewed-on: https://gerrit.libreoffice.org/67619
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/Package_html_media.mk b/Package_html_media.mk
index b98665a9b..64cf31b80 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
helpimg/smzb7.png \
helpimg/smzb8.png \
helpimg/smzb9.png \
+ helpimg/scalc/coordinates-to-polar-01.svg \
helpimg/starmath/al21801.svg \
helpimg/starmath/al21802.svg \
helpimg/starmath/al21803.svg \
diff --git a/source/media/helpimg/scalc/coordinates-to-polar-01.svg b/source/media/helpimg/scalc/coordinates-to-polar-01.svg
new file mode 100755
index 000000000..2a6b057be
--- /dev/null
+++ b/source/media/helpimg/scalc/coordinates-to-polar-01.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="76.2mm" height="60.96mm" fill-rule="evenodd" stroke-linejoin="round" stroke-width="28.222" baseProfile="tiny" preserveAspectRatio="xMidYMid" version="1.2" viewBox="0 0 7620 6096" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+ <font id="a" horiz-adv-x="2048">
+ <font-face font-family="Arial embedded" font-weight="bold" ascent="1879" descent="476" units-per-em="2048"/>
+ <missing-glyph d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z" horiz-adv-x="2048"/>
+ <glyph d="M 571,1086 L 508,838 C 460,823 424,789 401,736 378,683 366,626 366,565 366,484 385,411 422,345 459,278 517,232 594,207 L 594,663 C 594,776 602,859 619,913 635,967 667,1009 714,1040 761,1071 822,1086 898,1086 1003,1086 1092,1060 1167,1009 1242,957 1297,889 1334,806 1370,722 1388,639 1388,557 1388,416 1343,290 1254,181 1164,71 1038,1 875,-28 L 875,-404 594,-404 594,-28 C 435,-5 309,59 217,166 124,272 78,400 78,549 78,718 125,853 220,956 302,1044 419,1087 571,1086 Z M 875,193 C 1024,260 1099,393 1099,593 1099,664 1084,725 1055,778 1026,831 989,857 946,857 924,857 907,847 894,827 881,806 875,739 875,626 L 875,193 Z" horiz-adv-x="1298" unicode="φ"/>
+ <glyph d="M 86,1172 C 86,1261 117,1336 180,1398 242,1460 317,1491 405,1491 493,1491 568,1460 631,1398 693,1335 724,1260 724,1172 724,1084 693,1009 631,947 568,884 493,853 405,853 317,853 242,884 180,947 117,1009 86,1084 86,1172 Z M 252,1172 C 252,1130 267,1094 297,1064 327,1034 363,1019 405,1019 447,1019 483,1034 513,1064 543,1094 558,1130 558,1172 558,1214 543,1250 513,1280 483,1310 447,1325 405,1325 363,1325 327,1310 297,1280 267,1250 252,1214 252,1172 Z" horiz-adv-x="610" unicode="°"/>
+ <glyph d="M 176,-431 L 176,1491 399,1491 399,-431 176,-431 Z" horiz-adv-x="186" unicode="|"/>
+ <glyph d="M 149,0 L 149,1466 624,1466 C 804,1466 921,1459 976,1444 1060,1422 1130,1374 1187,1301 1244,1227 1272,1132 1272,1015 1272,925 1256,849 1223,788 1190,727 1149,679 1099,644 1048,609 997,585 945,574 874,560 772,553 638,553 L 445,553 445,0 149,0 Z M 445,1218 L 445,802 607,802 C 724,802 802,810 841,825 880,840 911,864 934,897 956,930 967,968 967,1011 967,1064 951,1108 920,1143 889,1178 849,1199 801,1208 766,1215 695,1218 588,1218 L 445,1218 Z" horiz-adv-x="1086" unicode="P"/>
+ <glyph d="M 85,816 L 85,1074 1110,1074 1110,816 85,816 Z M 85,372 L 85,631 1110,631 1110,372 85,372 Z" horiz-adv-x="1007" unicode="="/>
+ <glyph d="M 93,339 L 365,369 C 372,314 389,273 417,246 445,219 482,206 528,206 586,206 635,233 676,286 717,339 743,450 754,618 683,536 595,495 489,495 374,495 274,540 191,629 107,718 65,833 65,976 65,1125 109,1245 198,1336 286,1427 398,1472 535,1472 684,1472 806,1415 901,1300 996,1185 1044,995 1044,732 1044,464 994,271 895,152 796,33 666,-26 507,-26 392,-26 300,5 229,66 158,127 113,218 93,339 Z M 729,953 C 729,1044 708,1114 667,1164 625,1214 577,1239 522,1239 470,1239 427,1219 393,1178 358,1137 341,1069 341,976 341,881 360,812 397,768 434,723 481,701 537,701 591,701 637,722 674,765 711,808 729,870 729,953 Z" horiz-adv-x="927" unicode="9"/>
+ <glyph d="M 328,791 C 255,822 203,864 170,918 137,971 120,1030 120,1094 120,1203 158,1294 235,1365 311,1436 419,1472 560,1472 699,1472 808,1436 885,1365 962,1294 1000,1203 1000,1094 1000,1026 982,966 947,913 912,860 862,819 798,791 879,758 941,711 984,648 1026,585 1047,513 1047,431 1047,296 1004,186 918,101 831,16 716,-26 573,-26 440,-26 329,9 240,79 135,162 83,275 83,419 83,498 103,571 142,638 181,704 243,755 328,791 Z M 386,1074 C 386,1018 402,974 434,943 465,912 507,896 560,896 613,896 656,912 688,944 720,975 736,1019 736,1075 736,1128 720,1170 689,1202 657,1233 615,1249 563,1249 509,1249 466,1233 434,1201 402,1169 386,1127 386,1074 Z M 360,446 C 360,369 380,308 420,265 459,222 509,200 568,200 626,200 674,221 712,263 750,304 769,364 769,443 769,512 750,567 711,609 672,650 623,671 564,671 495,671 444,647 411,600 377,553 360,501 360,446 Z" horiz-adv-x="927" unicode="8"/>
+ <glyph d="M 87,1185 L 87,1446 1048,1446 1048,1242 C 969,1164 888,1052 806,906 724,760 662,605 619,441 576,276 554,129 555,0 L 284,0 C 289,203 331,409 410,620 489,831 594,1019 726,1185 L 87,1185 Z" horiz-adv-x="927" unicode="7"/>
+ <glyph d="M 91,377 L 371,406 C 379,343 403,293 442,256 481,219 527,200 578,200 637,200 686,224 727,272 768,319 788,391 788,487 788,577 768,645 728,690 687,735 635,757 570,757 489,757 417,721 353,650 L 125,683 269,1446 1012,1446 1012,1183 482,1183 438,934 C 501,965 565,981 630,981 755,981 860,936 947,845 1034,754 1077,637 1077,492 1077,371 1042,264 972,169 877,40 744,-25 575,-25 440,-25 329,11 244,84 159,157 108,254 91,377 Z" horiz-adv-x="954" unicode="5"/>
+ <glyph d="M 638,0 L 638,295 38,295 38,541 674,1472 910,1472 910,542 1092,542 1092,295 910,295 910,0 638,0 Z M 638,542 L 638,1043 301,542 638,542 Z" horiz-adv-x="1033" unicode="4"/>
+ <glyph d="M 806,0 L 525,0 525,1059 C 422,963 301,892 162,846 L 162,1101 C 235,1125 315,1171 401,1238 487,1305 546,1383 578,1472 L 806,1472 806,0 Z" horiz-adv-x="636" unicode="1"/>
+ <glyph d="M 147,0 L 147,281 428,281 428,0 147,0 Z" horiz-adv-x="266" unicode="."/>
+ <glyph d="M 115,391 L 115,672 667,672 667,391 115,391 Z" horiz-adv-x="530" unicode="-"/>
+ <glyph d="M 69,-431 C 124,-312 163,-221 186,-158 209,-95 230,-22 249,61 268,144 283,222 292,297 301,371 306,447 306,525 306,684 289,834 255,976 221,1117 158,1289 67,1491 L 258,1491 C 359,1348 437,1196 493,1035 548,874 576,711 576,546 576,407 554,257 510,98 460,-81 378,-257 263,-431 L 69,-431 Z" horiz-adv-x="478" unicode=")"/>
+ <glyph d="M 613,-431 L 420,-431 C 318,-277 240,-117 187,49 134,215 107,376 107,531 107,724 140,906 206,1078 263,1227 336,1365 424,1491 L 616,1491 C 525,1289 462,1117 428,976 393,834 376,684 376,525 376,416 386,304 407,189 427,74 455,-35 490,-138 513,-206 554,-304 613,-431 Z" horiz-adv-x="477" unicode="("/>
+ </font>
+ </defs>
+ <g>
+ <desc>Master slide
+ </desc>
+ <rect width="7620" height="6096" fill="none"/>
+ </g>
+ <g>
+ <path d="m1745 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1491 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1999 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m2539 1279l-66 3536" fill="none" stroke="#ccc" stroke-linejoin="round" stroke-width="35"/>
+ <path d="m2253 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m2761 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m3269 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m3015 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m3490 1292v3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m4031 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m3777 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round" stroke-width="53"/>
+ <path d="m4285 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m4793 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m4539 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m5097 1242l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round" stroke-width="35"/>
+ <path d="m5555 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m5301 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m5809 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m6063 1292l-33 3556" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1204 1546h5070" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1254 1750h5070" fill="none" stroke="#ccc" stroke-linejoin="round" stroke-width="35"/>
+ <path d="m1214 2054h5070" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1214 2308h5070" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1214 2562h5070" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1214 2816h5070" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1214 3070h5070" fill="none" stroke="#ccc" stroke-linejoin="round" stroke-width="53"/>
+ <path d="m1214 3324h5070" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1214 3578h5070" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1214 3832h5070" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1214 4086h5070" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m1264 4290h5070" fill="none" stroke="#ccc" stroke-linejoin="round" stroke-width="35"/>
+ <path d="m1214 4594h5070" fill="none" stroke="#ccc" stroke-linejoin="round"/>
+ <path d="m3744 3070h1778" fill="none" stroke="#f33" stroke-linejoin="round" stroke-width="81"/>
+ <path d="m3744 3070l-2032-1270" fill="none" stroke="#f33" stroke-linejoin="round" stroke-width="81"/>
+ <path d="m2706 2338c112-158 236-271 403-368 202-117 401-170 635-170s433 53 635 170 348 263 465 465c114 198 167 392 170 621" fill="none" stroke="#66f" stroke-linejoin="round" stroke-width="53"/>
+ <g>
+ <rect x="1635" y="1127" width="2044" height="739" fill="none"/>
+ <g fill="#f33" font-family="Arial embedded" font-size="423" font-weight="700">
+ <text x="1885" y="1646">
+ <tspan x="1885 2169 2414 2554 2694 2931 3049 3286">P=(-8|5)</tspan></text>
+ </g>
+ </g>
+ <g>
+ <rect x="4427" y="1532" width="2289" height="739" fill="none"/>
+ <g fill="#66f" font-family="Arial embedded" font-size="423" font-weight="700">
+ <text x="4677" y="2051">
+ <tspan x="4677 4982 5227 5464 5701 5939 6057 6294">φ=147.9°</tspan></text>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp
index 25c822517..c2f40d1c8 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -221,18 +221,27 @@
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ARCTAN2" id="bm_id3159180" localize="false"/>
<paragraph id="hd_id3153983" role="heading" level="2" xml-lang="en-US">ATAN2</paragraph>
-<paragraph id="par_id3154297" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ARCTAN2">Returns the inverse trigonometric tangent of the specified x and y coordinates.</ahelp></paragraph>
-
+<paragraph id="par_id3154297" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ARCTAN2">Returns the angle (in radians) between the x-axis and a line from the origin to the point (NumberX|NumberY).</ahelp></paragraph>
+<embed href="text/scalc/01/ODFF.xhp#odff"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id3156013" role="code" xml-lang="en-US">ATAN2(NumberX; NumberY)</paragraph>
-<paragraph id="par_id3151168" role="paragraph" xml-lang="en-US"><emph>NumberX</emph> is the value of the x coordinate.</paragraph>
+<paragraph id="par_id3001800" role="paragraph" xml-lang="en-US"><emph>NumberX</emph> is the value of the x coordinate.</paragraph>
<paragraph id="par_id3152798" role="paragraph" xml-lang="en-US"><emph>NumberY</emph> is the value of the y coordinate.</paragraph>
-<paragraph id="par_id5036164" role="paragraph" xml-lang="en-US">ATAN2 returns the inverse trigonometric tangent, that is, the angle (in radians) between the x-axis and a line from point NumberX, NumberY to the origin. The angle returned is between -PI and PI.</paragraph>
-<paragraph id="par_id3001800" role="paragraph" xml-lang="en-US">To return the angle in degrees, use the DEGREES function.</paragraph>
+<tip id="par_id5036168">Programming languages have usually the opposite order of arguments for their atan2() function.</tip>
+<paragraph id="par_id5036165" role="paragraph" xml-lang="en-US">ATAN2 returns the angle (in radians) between the x-axis and a line from the origin to the point (NumberX|NumberY)</paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
-<paragraph id="par_id3154692" role="paragraph" xml-lang="en-US"><item type="input">=ATAN2(20;20)</item> returns 0.785398163397448 (PI/4 radians).</paragraph>
-<paragraph id="par_id1477095" role="paragraph" xml-lang="en-US"><item type="input">=DEGREES(ATAN2(12.3;12.3))</item> returns 45. The tangent of 45 degrees is 1.</paragraph><comment>see also COS, SIN, TAN, COT, ACOS, ASIN, ATAN, ACOT</comment>
+<paragraph id="par_id3154692" role="paragraph" xml-lang="en-US"><item type="input">=ATAN2(-5;9)</item> returns 2.07789 radians.</paragraph>
+
+<paragraph id="par_id5036166" role="paragraph" xml-lang="en-US">To get the angle in degrees apply the DEGREES function to the result.</paragraph>
+<paragraph id="par_id1477095" role="paragraph" xml-lang="en-US"><input>=DEGREES(ATAN2(12.3;12.3))</input> returns 45. The tangent of 45 degrees is 1.</paragraph><comment>see also COS, SIN, TAN, COT, ACOS, ASIN, ATAN, ACOT</comment>
+<note id="par_id5036167">%PRODUCTNAME results 0 for ATAN2(0;0).</note>
+
+<paragraph id="par_id5036169" role="paragraph" xml-lang="en-US">The function can be used in converting cartesian coordinates to polar coordinates.</paragraph>
+<paragraph id="par_id5036170" role="paragraph" xml-lang="en-US">=DEGREES(ATAN2(-8;5)) returns φ = 147.9 degrees</paragraph>
+<paragraph role="paragraph" id="par_id5036171" xml-lang="en-US">
+<image id="img_id3150758" src="media/helpimg/scalc/coordinates-to-polar-01.svg" width="2.5inch" height="1.5inch"><alt id="alt_id3150758" xml-lang="en-US">Cartesian coordinates to polar coordinates example</alt></image>
+</paragraph>
<embed href="text/scalc/06/calcsamplefiles.xhp#trigon"/>
</section>
More information about the Libreoffice-commits
mailing list