8299756: Minor updates in CSS Reference

Reviewed-by: kcr, jhendrikx, mhanl

Author: Andy Goryachev

modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html

@@ -2,7 +2,7 @@
 
 <!--
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -277,6 +277,7 @@ <h2>Contents</h2>
           <li><a href="#typefont">&lt;font&gt;</a></li>
           <li><a href="#typepaint">&lt;paint&gt;</a></li>
           <li><a href="#typecolor">&lt;color&gt;</a></li>
+          <li><a href="#typetextbounds">&lt;text-bounds&gt;</a></li>
         </ul>
       </li>
         <li><a href="#stage">Stage</a>
@@ -351,6 +352,7 @@ <h2>Contents</h2>
           <li>javafx.scene.text
             <ul>
               <li><a href="#text">Text</a></li>
+              <li><a href="#textflow">TextFlow</a></li>
             </ul>
           </li>
         </ul>
@@ -1071,6 +1073,7 @@ <h3><a id="typefont">&lt;font&gt;</a></h3>
       font family. An actual font family name available on the system can be
       used, or one of the following generic family names can be used:</p>
     <ul>
+      <li>'system'</li>
       <li>'serif' (e.g., Times)</li>
       <li>'sans-serif' (e.g., Helvetica)</li>
       <li>'cursive' (e.g., Zapf-Chancery)</li>
@@ -1576,6 +1579,32 @@ <h4>Color Functions <span class="grammar" style="font-size: smaller;">&lt;color-
           href="#typecolor"
           class="typelink">&lt;color&gt;</a>
         ) ]+ </span></p>
+    <h3><a id="typetextbounds">&lt;text-bounds&gt;</a></h3>
+    <p>The geometry of text can be measured either in terms of the bounds of
+       the particular text to be rendered - visual bounds, or as properties
+       of the font and the characters to be rendered - logical bounds.
+       Visual bounds are more useful for positioning text as graphics, and
+       for obtaining tight enclosing bounds around the text.</p>
+    <p>Logical bounds are important for laying out text relative to other
+       text and other components, particularly those which also contain text.
+       The bounds aren't specific to the text being rendered, and so will
+       report heights which account for the potential ascent and descent of
+       text using the font at its specified size. Also leading and trailing
+       spaces are part of the logical advance width of the text.</p>
+    <p>&nbsp;</p>
+    <p class="grammar">[ logical | visual | logical-vertical-center ]</p>
+    <ul>
+      <li><strong>logical</strong>: The logical bounds are based on font metrics information.
+          The width is based on the glyph advances and the height of the ascent, descent, and
+          line gap, except for the last line which does not include the line gap.
+          This is usually the fastest option.</li>
+      <li><strong>visual</strong>: Use visual bounds as the basis for calculating the bounds.
+          This is likely to be slower than using logical bounds.</li>
+      <li><strong>logical-vertical-center</strong>: Use logical vertical centered bounds
+          as the basis for calculating the bounds.
+          This bounds type is typically used to center Text nodes vertically
+          within the bounds of its parent.</li>
+    </ul>
     <h2><a id="stage">Stage</a></h2>
     <table class="package" width="100%">
         <tbody>
@@ -1668,7 +1697,7 @@ <h4><a id="node">Node</a></h4>
           <td class="default">false</td>
           <td class="range">&nbsp;</td>
           <td>The default value for controls is true, although there are some exceptions.
-          See <a href="#controls">Controls</a> for details.</td>
+          See <a href="#control">Control</a> for details.</td>
         </tr>
         <tr>
         <th class="propertyname" scope="row">-fx-view-order</th>
@@ -3024,6 +3053,24 @@ <h4><a id="text">Text</a></h4>
         </tr>
       </thead>
       <tbody>
+        <tr>
+        <th class="propertyname" scope="row">-fx-bounds-type</th>
+          <td class="value"><a href="#typetextbounds" class="typelink">&lt;text-bounds&gt;</a></td>
+          <td>logical</td>
+          <td></td>
+        </tr>
+        <tr>
+        <th class="propertyname" scope="row">-fx-line-spacing</th>
+          <td class="value"><a href="#typenumber" class="typelink">&lt;number&gt;</a></td>
+          <td>0</td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+        <th class="propertyname" scope="row">-fx-fill</th>
+          <td class="value"><a href="#typepaint" class="typelink">&lt;paint&gt;</a></td>
+          <td>BLACK</td>
+          <td>text color</td>
+        </tr>
         <tr>
         <th class="propertyname" scope="row">-fx-font</th>
           <td class="value"><a href="#typefont" class="typelink">&lt;font&gt;</a></td>
@@ -3072,6 +3119,43 @@ <h4><a id="text">Text</a></h4>
         </tr>
       </tbody>
     </table>
+    <h4><a id="textflow">TextFlow</a></h4>
+<p class="styleclass">Style class: empty by default</p>
+    <table class="csspropertytable">
+    <caption>Available CSS Properties</caption>
+      <thead>
+        <tr>
+        <th class="propertyname" scope="col">CSS Property</th>
+        <th class="value" scope="col">Values</th>
+        <th scope="col">Default</th>
+        <th scope="col">Comments</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+        <th class="propertyname" scope="row">-fx-line-spacing</th>
+          <td class="value"><a href="#typenumber" class="typelink">&lt;number&gt;</a></td>
+          <td>0</td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+        <th class="propertyname" scope="row">-fx-tab-size</th>
+          <td class="value"><a href="#typenumber" class="typelink">&lt;integer&gt;</a></td>
+          <td>8</td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+        <th class="propertyname" scope="row">-fx-text-alignment</th>
+          <td class="value">[ left | center | right | justify ] </td>
+          <td>left</td>
+          <td>inherits</td>
+        </tr>
+        <tr>
+        <th colspan="4" class="parents" scope="row">Also has <a href="#fontprops">font
+            properties</a> and all properties of <a href="#pane">Pane</a></th>
+        </tr>
+      </tbody>
+    </table>
     <table class="package" width="100%">
       <tbody>
         <tr>
@@ -3158,6 +3242,7 @@ <h4><a id="webview">WebView</a></h4>
       </tbody>
     </table>
     <!-- Controls -->
+    <h2><a id="controls">Controls</a></h2>
     <table class="package" width="100%">
       <tbody>
         <tr>

modules/javafx.graphics/src/main/java/javafx/scene/text/TextBoundsType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
  * <p>
  * Logical bounds are important for laying out text relative to other
  * text and other components, particularly those which also contain text.
- * The bounds isn't specific to the text being rendered, and so will
+ * The bounds aren't specific to the text being rendered, and so will
  * report heights which account for the potential ascent and descent of
  * text using the font at its specified size. Also leading and trailing
  * spaces are part of the logical advance width of the text.
@@ -51,8 +51,8 @@ public enum TextBoundsType {
      * Use logical bounds as the basis for calculating the bounds.
      * <p>
      * The logical bounds are based on font metrics information. The width is
-     * based on the glyph advances and the height on the ascent, descent, and
-     * line gap. Except for the last line which does not include the line gap.
+     * based on the glyph advances and the height of the ascent, descent, and
+     * line gap, except for the last line which does not include the line gap.
      * <p>
      * Note: This is usually the fastest option.
      */