Skip to content

Commit 3ce7948

Browse files
authored
Merge pull request #442 from doc4d/main
upgrade after fixes
2 parents 09710b7 + 75e4745 commit 3ce7948

File tree

1,394 files changed

+11320
-10525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,394 files changed

+11320
-10525
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ To generate syntax files:
3535

3636
`npm run syntax`
3737

38+
- auto build for main
39+
- for a beta branch: get the prod and generate, then push in the branch
40+
3841
## Markdown conventions
3942

4043
### API file names

docs/FormEditor/properties_FormProperties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ A CSS file defined at the form level will override default style sheet(s). For m
4444

4545
## Form Class
4646

47-
Name of an existing [user class](../Concepts/classes.md#class-definition) to associate to the form . The user class can belong to the host project or to a [component](../Extensions/develop-components.md#sharing-of-classes), in which case the formal syntax is "[*componentNameSpace*](../settings/general.md#component-namespace-in-the-class-store).className".
47+
Name of an existing [user class](../Concepts/classes.md#class-definition) to associate to the form. The user class can belong to the host project or to a [component](../Extensions/develop-components.md#sharing-of-classes), in which case the formal syntax is "[*componentNameSpace*](../settings/general.md#component-namespace-in-the-class-store).className".
4848

4949
Associating a class to the form provides the following benefits:
5050

docs/FormObjects/properties_BackgroundAndBorder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ You can also set this property using the [`OBJECT SET RGB COLORS`](../commands-l
5252

5353
An expression or a variable (array variables cannot be used) to apply a custom background color to each row of the list box. The expression or variable will be evaluated for each row displayed and must return a RGB color value. For more information, refer to the description of the [`OBJECT SET RGB COLORS`](../commands-legacy/object-set-rgb-colors.md) command in the *4D Language Reference manual*.
5454

55-
You can also set this property using the [`LISTBOX SET PROPERTY`](../commands-legacy/listbox-set-property.md) command with `lk background color expression` constant.
55+
You can also set this property using the [`LISTBOX SET PROPERTY`](../commands/listbox-set-property.md) command with `lk background color expression` constant.
5656

5757
>With collection or entity selection type list boxes, this property can also be set using a [Meta Info Expression](properties_Text.md#meta-info-expression).
5858

docs/FormObjects/properties_Text.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ Then, the *Color* method would contain:
373373

374374
## Multi-style
375375

376-
This property enables the possibility of using specific styles in the selected area. When this option is checked, 4D interprets any `<SPAN> HTML` tags found in the area.
376+
This property enables the possibility of using [specific styles](https://doc.4d.com/4Dv20/4D/20.6/Supported-tags.300-7488021.en.html) in the selected area. When this option is checked, 4D interprets any `<SPAN> HTML` tags found in the area.
377377

378378
By default, this option is not enabled.
379379

docs/Notes/updates.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@ Read [**What’s new in 4D 20 R10**](https://blog.4d.com/en-whats-new-in-4d-20-R
1414
- UUIDs in 4D are now generated in **version 7**. In previous 4D releases, they were generated in version 4.
1515
- 4D Language:
1616
- For consistency, [`Create entity selection`](../commands/create-entity-selection.md) and [`USE ENTITY SELECTION`](../commands/use-entity-selection.md) commands have been moved from the ["4D Environment"](../commands/theme/4D_Environment.md) to the ["Selection"](../commands/theme/Selection.md) themes.
17+
- New [`OBJECT SET DATA SOURCE FORMULA`](../commands/object-set-data-source-formula.md) and [`OBJECT Get data source formula`](../commands/object-get-data-source-formula.md) commands to assign and read `Formula` objects as data sources for form objects.
18+
- [`LISTBOX SET PROPERTY`](../commands/listbox-set-property.md) and [`LISTBOX Get property`](../commands/listbox-get-property.md) support three new constants: `lk current item`, `lk current item position`, and `lk selected items expression`.
19+
20+
1721

1822
#### Behavior changes
1923

2024
- On Windows, current printer fonts intended only for printing (i.e. not usable on screen) are no longer loaded by 4D at startup.
25+
- The *MeCab* library has been removed. This change only affects the processing of Japanese text.
2126

2227

2328
## 4D 20 R9
@@ -37,6 +42,7 @@ Read [**What’s new in 4D 20 R9**](https://blog.4d.com/en-whats-new-in-4d-20-R9
3742
- New [4D AIKit component](../aikit/overview.md) enabling interaction with third-party AI APIs.
3843
- The following VP command callbacks now wait for all 4D custom functions to complete their calculations: [VP IMPORT DOCUMENT](../ViewPro/commands/vp-import-document.md), [VP IMPORT FORM BLOB](../ViewPro/commands/vp-import-from-blob.md), [VP IMPORT FROM OBJECT](../ViewPro/commands/vp-import-from-object.md), and [VP FLUSH COMMANDS](../ViewPro/commands/vp-flush-commands.md).
3944
- New [4D Netkit](https://developer.4d.com/4D-NetKit/) features to manage Google and Microsoft 365 calendars; ability to use the host web server for OAuth 2.0 authentication.
45+
- The [*MeCab* library](../settings/database.md#support-of-mecab-japanese-version) is now deprecated and will be removed in the next release.
4046
- 4D Write Pro Interface: New [integrated AI](../WritePro/writeprointerface.md#integrated-ai) to interact with **chatGTP** from your 4D Write Pro documents.
4147
- [**Fixed bug list**](https://bugs.4d.fr/fixedbugslist?version=20_R9): list of all bugs that have been fixed in 4D 20 R9.
4248

@@ -122,7 +128,7 @@ Read [**What’s new in 4D 20 R6**](https://blog.4d.com/en-whats-new-in-4d-20-R6
122128
- New [`$singleton` API](../REST/$singleton.md) to call exposed singleton functions from REST and new [associated privileges](../ORDA/privileges.md).
123129
- A [new settings button](../settings/web.md#activate-rest-authentication-through-dsauthentify-function) helps you upgrade your project to use "force login" REST mode (the `On REST Authentication` database method is now deprecated).
124130
- A [new settings tab](../Project/compiler.md#warnings) helps you define warnings generation globally.
125-
- Several commands, mainly from the "4D Environment" theme, are now thread-safe ([see the full list](https://doc.4d.com/4Dv20R6/4D/Preemptive_6957385.999-2878208.en.html)), as well as some selectors of the [`SET DATABASE PARAMETER`](../commands-legacy/set-database-parameter.md)/[`Get database parameter`](../commands-legacy/get-database-parameter.md) commands.
131+
- Several commands, mainly from the "4D Environment" theme, are now thread-safe, as well as some selectors of the [`SET DATABASE PARAMETER`](../commands-legacy/set-database-parameter.md)/[`Get database parameter`](../commands-legacy/get-database-parameter.md) commands.
126132
- New [4D-QPDF component](https://github.com/4d/4D-QPDF) that provides the `PDF Get attachments` command to extract attachments from a PDF/A3 document.
127133
- 4D Language commands: [What's new page](https://doc.4d.com/4Dv20R6/4D/20-R6/What-s-new.901-6957482.en.html) on doc.4d.com.
128134
- 4D Write Pro: [What's new page](https://doc.4d.com/4Dv20R6/4D/20-R6/What-s-new.901-6993921.en.html) on doc.4d.com.

docs/WebServer/sessions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ Web sessions are used for:
2424

2525
The session management feature can be enabled and disabled on your 4D web server. There are different ways to enable session management:
2626

27-
- Using the **Scalable sessions** OTPion on the "Web/OTPions (I)" page of the Settings (permanent setting):
27+
- Using the **Scalable sessions** option on the "Web/Options (I)" page of the Settings (permanent setting):
2828
![alt-text](../assets/en/WebServer/settingsSession.png)
2929

30-
This OTPion is selected by default in new projects. It can however be disabled by selecting the **No sessions** OTPion, in which case the web session features are disabled (no `Session` object is available).
30+
This option is selected by default in new projects. It can however be disabled by selecting the **No sessions** option, in which case the web session features are disabled (no `Session` object is available).
3131

32-
- Using the [`.scalableSession`](API/WebServerClass.md#scalablesession) property of the Web Server object (to pass in the *settings* parameter of the [`.start()`](API/WebServerClass.md#start) function). In this case, this setting overrides the OTPion defined in the Settings dialog box for the Web Server object (it is not stored on disk).
32+
- Using the [`.scalableSession`](API/WebServerClass.md#scalablesession) property of the Web Server object (to pass in the *settings* parameter of the [`.start()`](API/WebServerClass.md#start) function). In this case, this setting overrides the option defined in the Settings dialog box for the Web Server object (it is not stored on disk).
3333

3434
> The [`WEB SET OTPION`](../commands-legacy/web-set-option.md) command can also set the session mode for the main Web server.
3535
3636
In any cases, the setting is local to the machine; so it can be different on the 4D Server Web server and the Web servers of remote 4D machines.
3737

38-
> **Compatibility**: A **Legacy sessions** OTPion is available in projects created with a 4D version prior to 4D v18 R6 (for more information, please refer to the [doc.4d.com](https://doc.4d.com) web site).
38+
> **Compatibility**: A **Legacy sessions** option is available in projects created with a 4D version prior to 4D v18 R6 (for more information, please refer to the [doc.4d.com](https://doc.4d.com) web site).
3939
4040

4141
## Session implementation

docs/WritePro/commands-legacy/wp-paragraph-range.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@ displayed_sidebar: docs
1414

1515
<!-- END REF-->
1616

17-
## Compatibility
18-
19-
<!--REF #_command_.WP Paragraph range.Summary-->**WP Paragraph range** was named **WP Create Paragraph range** in previous versions of 4D Write Pro.<!-- END REF--> It has been renamed for clarity.
20-
2117
## Description
2218

23-
The **WP Paragraph range** command returns a specific range object that addresses only the paragraphs that intersect with the *targetObj* you passed as parameter. The paragraph range object returned can be used by [WP GET ATTRIBUTES](../commands/wp-get-attributes.md) and [WP SET ATTRIBUTES](../commands/wp-set-attributes.md) to handle paragraph attributes only.
19+
<!--REF #_command_.WP Paragraph range.Summary-->The **WP Paragraph range** command returns a specific range object that addresses only the paragraphs that intersect with the *targetObj* you passed as parameter.<!-- END REF--> The paragraph range object returned can be used by [WP GET ATTRIBUTES](../commands/wp-get-attributes.md) and [WP SET ATTRIBUTES](../commands/wp-set-attributes.md) to handle paragraph attributes only.
2420

2521
In *targetObj*, you can pass:
2622

docs/aikit/Classes/OpenAIImage.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ https://platform.openai.com/docs/api-reference/images/object
2323

2424
**asBlob**() : 4D.Blob
2525

26+
| Parameter | Type | Description |
27+
|------------------|---------|---------------------------------------------------------|
2628
| Function result| 4D.Blob | Converts the generated image to a blob format based on its URL or base64-encoded JSON. |
2729

2830
#### Example Usage
@@ -35,6 +37,8 @@ var $blob:=$image.asBlob()
3537

3638
**asPicture**() : Picture
3739

40+
| Parameter | Type | Description |
41+
|------------------|---------|---------------------------------------------------------|
3842
| Function result| Picture | Creates a picture object from the blob converted image. |
3943

4044
#### Example Usage

docs/aikit/Classes/OpenAIVision.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Helper for vision stuff.
1111

1212
### create()
1313

14-
**create*(*imageURL* : Text) : OpenAIVisionHelper
14+
**create**(*imageURL* : Text) : OpenAIVisionHelper
1515

1616
| Parameter | Type | Description |
1717
|------------------|-------|-------------------------------|
@@ -27,7 +27,7 @@ var $result:=$helper.prompt("Could you describe it?")
2727

2828
### fromFile()
2929

30-
**fromFile*(*imageFile* : 4D.File) : OpenAIVisionHelper
30+
**fromFile**(*imageFile* : 4D.File) : OpenAIVisionHelper
3131

3232
| Parameter | Type | Description |
3333
|------------------|-----------|------------------------------|
@@ -37,13 +37,13 @@ var $result:=$helper.prompt("Could you describe it?")
3737
#### Example Usage
3838

3939
```4d
40-
var $helper:=$client.chat.vision.fromFile(Folder(fk resource foldres).file("image.png"))
40+
var $helper:=$client.chat.vision.fromFile(Folder(fk resources folder).file("image.png"))
4141
var $result:=$helper.prompt("Could you describe it?")
4242
```
4343

4444
### fromPicture()
4545

46-
**fromPicture*(*image* : Picture) : OpenAIVisionHelper
46+
**fromPicture**(*image* : Picture) : OpenAIVisionHelper
4747

4848
| Parameter | Type | Description |
4949
|------------------|-----------|------------------------------|

docs/commands-legacy/listbox-get-arrays.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ For record selection, collection or entity selection type list boxes, *arrStyles
4747
## See also
4848

4949
[LISTBOX Get array](listbox-get-array.md)
50-
[LISTBOX Get property](listbox-get-property.md)
50+
[LISTBOX Get property](../commands/listbox-get-property.md)
5151
[LISTBOX SET ARRAY](listbox-set-array.md)
5252

5353
## Properties

0 commit comments

Comments
 (0)