diff --git a/Project/Sources/Methods/00_test.4dm b/Project/Sources/Methods/00_test.4dm
index cb91bfb..7aa7a5c 100644
--- a/Project/Sources/Methods/00_test.4dm
+++ b/Project/Sources/Methods/00_test.4dm
@@ -27,6 +27,12 @@ $Dom_svg:=SVG_New
Case of
+ //______________________________________________________
+ : (True:C214)
+
+ $Dom_picture:=SVG_New_image($Dom_svg; "#4DPop.png")
+ SVG_FADE_TO_GREY_SCALE($Dom_picture)
+
//______________________________________________________
: (True:C214) //ACI0104291
diff --git a/Project/Sources/Methods/COMPILER_4DPop.4dm b/Project/Sources/Methods/COMPILER_4DPop.4dm
deleted file mode 100644
index 11f29be..0000000
--- a/Project/Sources/Methods/COMPILER_4DPop.4dm
+++ /dev/null
@@ -1,6 +0,0 @@
-//%attributes = {"invisible":true}
-C_OBJECT:C1216(_4DPopSVG; $0)
-C_OBJECT:C1216(about; $1)
-C_OBJECT:C1216(syntax; $1)
-C_OBJECT:C1216(colors; $1)
-C_OBJECT:C1216(viewer; $1)
\ No newline at end of file
diff --git a/Project/Sources/Methods/COMPILER_Not_Thread_Safe.4dm b/Project/Sources/Methods/COMPILER_Not_Thread_Safe.4dm
index 2d0a480..5a4e735 100644
--- a/Project/Sources/Methods/COMPILER_Not_Thread_Safe.4dm
+++ b/Project/Sources/Methods/COMPILER_Not_Thread_Safe.4dm
@@ -1,107 +1,37 @@
//%attributes = {"invisible":true}
-C_TEXT:C284(<>SVG_viewerSource)
-C_PICTURE:C286(<>SVG_viewerPicture)
-C_PICTURE:C286(<>SVG_viewerPictureBackup)
-C_TEXT:C284(<>SVG_Txt_Viewer_Callback_Method)
+var <>SVG_viewerSource : Text
+var <>SVG_viewerPicture : Picture
+var <>SVG_viewerPictureBackup : Picture
+var <>SVG_Txt_Viewer_Callback_Method : Text
-C_BOOLEAN:C305(<>showColoredBackground)
-C_LONGINT:C283(<>backgroundColor)
-C_LONGINT:C283(<>sourceFontSize)
-C_BOOLEAN:C305(<>automaticallyResize)
+var <>showColoredBackground : Boolean
+var <>backgroundColor : Integer
+var <>sourceFontSize : Integer
+var <>automaticallyResize : Boolean
-C_LONGINT:C283(<>Lon_tabID)
-C_PICTURE:C286(<>Pic_viewerTab)
+var <>Lon_tabID : Integer
+var <>Pic_viewerTab : Picture
-C_TEXT:C284(<>svg_recentMenuRef)
+var <>svg_recentMenuRef : Text
-C_LONGINT:C283(<>Lon_viewerTimerEvent)
+var <>Lon_viewerTimerEvent : Integer
-C_LONGINT:C283(<>svg_tabID)
-C_LONGINT:C283(<>Lon_tabList)
+var <>svg_tabID : Integer
+var <>Lon_tabList : Integer
-C_LONGINT:C283(<>lst_syntax;<>Lon_currentElement)
-C_TEXT:C284(<>Txt_Name)
-C_LONGINT:C283(<>Lon_timerEvent)
-C_LONGINT:C283(<>bDocumentation)
+var <>lst_syntax; <>Lon_currentElement : Integer
+var <>Txt_Name : Text
+var <>Lon_timerEvent : Integer
+var <>bDocumentation : Integer
-C_LONGINT:C283(<>Lon_opacity)
+var <>Lon_opacity : Integer
-C_POINTER:C301(<>Ptr_Document) // Pointer to the Document variable of the host database
+var <>Ptr_Document : Pointer // Pointer to the Document variable of the host database
If (False:C215)
- ARRAY BOOLEAN:C223(<>tBoo_listbox;0)
- ARRAY PICTURE:C279(<>tPic_Colors;0x0000)
- ARRAY TEXT:C222(<>tTxt_colorNames;0x0000)
+ ARRAY BOOLEAN:C223(<>tBoo_listbox; 0)
+ ARRAY PICTURE:C279(<>tPic_Colors; 0x0000)
+ ARRAY TEXT:C222(<>tTxt_colorNames; 0x0000)
- // ----------------------------------------------------
- C_OBJECT:C1216(fallBack_Not_thread_safe ;$1)
-
- // ----------------------------------------------------
- C_BOOLEAN:C305(syntax_EXPAND ;$1)
-
- // ----------------------------------------------------
- C_TEXT:C284(Syntax_help ;$1)
-
- // ----------------------------------------------------
- C_LONGINT:C283(syntax_List ;$0)
-
- // ----------------------------------------------------
- C_TEXT:C284(Syntax_main ;$1)
-
- // ----------------------------------------------------
- C_TEXT:C284(Viewer_main ;$1)
- C_TEXT:C284(Viewer_main ;$2)
-
- // ----------------------------------------------------
- C_TEXT:C284(viewer_sources ;$0)
- C_TEXT:C284(viewer_sources ;$1)
-
- // ----------------------------------------------------
- C_TEXT:C284(Color_main ;$1)
-
- // ----------------------------------------------------
- C_POINTER:C301(SVG_ABOUT ;$1)
-
- // ----------------------------------------------------
- C_POINTER:C301(SVGTool_Display_syntax ;$1)
-
- // ----------------------------------------------------
- C_POINTER:C301(SVGTool_Display_viewer ;$1)
-
- // ----------------------------------------------------
- C_POINTER:C301(SVGTool_Display_colors ;$1)
-
- // ----------------------------------------------------
- C_TEXT:C284(SVGTool_SHOW_IN_VIEWER ;$1)
- C_TEXT:C284(SVGTool_SHOW_IN_VIEWER ;$2)
-
- // ----------------------------------------------------
- C_TEXT:C284(SVGTool_SET_VIEWER_CALLBACK ;$1)
-
- // ----------------------------------------------------
- C_LONGINT:C283(xToolBox_tabCreate ;$0)
- C_POINTER:C301(xToolBox_tabCreate ;$1)
- C_POINTER:C301(xToolBox_tabCreate ;$2)
- C_TEXT:C284(xToolBox_tabCreate ;$3)
-
- // ----------------------------------------------------
- C_LONGINT:C283(xToolBox_tabHandler ;$0)
- C_LONGINT:C283(xToolBox_tabHandler ;$1)
- C_POINTER:C301(xToolBox_tabHandler ;$2)
- C_LONGINT:C283(xToolBox_tabHandler ;$3)
- C_LONGINT:C283(xToolBox_tabHandler ;$4)
-
- // ----------------------------------------------------
- C_TEXT:C284(xToolBox_BytesToString ;$0)
- C_REAL:C285(xToolBox_BytesToString ;$1)
- C_TEXT:C284(xToolBox_BytesToString ;$2)
- C_TEXT:C284(xToolBox_BytesToString ;$3)
- C_TEXT:C284(xToolBox_BytesToString ;$4)
- C_LONGINT:C283(xToolBox_BytesToString ;$5)
-
- // ----------------------------------------------------
- xToolBox_NO_ERROR
-
- // ----------------------------------------------------
End if
\ No newline at end of file
diff --git a/Project/Sources/Methods/COMPILER_Rgx.4dm b/Project/Sources/Methods/COMPILER_Rgx.4dm
index 2f80670..3b503e0 100644
--- a/Project/Sources/Methods/COMPILER_Rgx.4dm
+++ b/Project/Sources/Methods/COMPILER_Rgx.4dm
@@ -1,49 +1,49 @@
//%attributes = {"invisible":true}
- // ----------------------------------------------------
- // Method : Compiler_Rgx
- // Created 28/09/07 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
+// ----------------------------------------------------
+// Method : Compiler_Rgx
+// Created 28/09/07 by Vincent de Lachaux
+// ----------------------------------------------------
+// Description
+//
+// ----------------------------------------------------
-C_LONGINT:C283(rgx_Lon_Error)
+var rgx_Lon_Error : Integer
If (False:C215)
- //Public ----------------------------
- C_LONGINT:C283(Rgx_ExtractText ;$0)
- C_TEXT:C284(Rgx_ExtractText ;$1)
- C_TEXT:C284(Rgx_ExtractText ;$2)
- C_TEXT:C284(Rgx_ExtractText ;$3)
- C_POINTER:C301(Rgx_ExtractText ;$4)
- C_LONGINT:C283(Rgx_ExtractText ;$5)
+ // Public ----------------------------
+ _O_C_LONGINT:C283(Rgx_ExtractText; $0)
+ _O_C_TEXT:C284(Rgx_ExtractText; $1)
+ _O_C_TEXT:C284(Rgx_ExtractText; $2)
+ _O_C_TEXT:C284(Rgx_ExtractText; $3)
+ _O_C_POINTER:C301(Rgx_ExtractText; $4)
+ _O_C_LONGINT:C283(Rgx_ExtractText; $5)
- C_TEXT:C284(Rgx_Get_Pattern ;$0)
- C_TEXT:C284(Rgx_Get_Pattern ;$1)
- C_TEXT:C284(Rgx_Get_Pattern ;$2)
- C_POINTER:C301(Rgx_Get_Pattern ;$3)
+ _O_C_TEXT:C284(Rgx_Get_Pattern; $0)
+ _O_C_TEXT:C284(Rgx_Get_Pattern; $1)
+ _O_C_TEXT:C284(Rgx_Get_Pattern; $2)
+ _O_C_POINTER:C301(Rgx_Get_Pattern; $3)
- C_LONGINT:C283(Rgx_MatchText ;$0)
- C_TEXT:C284(Rgx_MatchText ;$1)
- C_TEXT:C284(Rgx_MatchText ;$2)
- C_POINTER:C301(Rgx_MatchText ;$3)
- C_LONGINT:C283(Rgx_MatchText ;$4)
+ _O_C_LONGINT:C283(Rgx_MatchText; $0)
+ _O_C_TEXT:C284(Rgx_MatchText; $1)
+ _O_C_TEXT:C284(Rgx_MatchText; $2)
+ _O_C_POINTER:C301(Rgx_MatchText; $3)
+ _O_C_LONGINT:C283(Rgx_MatchText; $4)
- C_LONGINT:C283(Rgx_SplitText ;$0)
- C_TEXT:C284(Rgx_SplitText ;$1)
- C_TEXT:C284(Rgx_SplitText ;$2)
- C_POINTER:C301(Rgx_SplitText ;$3)
- C_LONGINT:C283(Rgx_SplitText ;$4)
+ _O_C_LONGINT:C283(Rgx_SplitText; $0)
+ _O_C_TEXT:C284(Rgx_SplitText; $1)
+ _O_C_TEXT:C284(Rgx_SplitText; $2)
+ _O_C_POINTER:C301(Rgx_SplitText; $3)
+ _O_C_LONGINT:C283(Rgx_SplitText; $4)
- C_LONGINT:C283(Rgx_SubstituteText ;$0)
- C_TEXT:C284(Rgx_SubstituteText ;$1)
- C_TEXT:C284(Rgx_SubstituteText ;$2)
- C_POINTER:C301(Rgx_SubstituteText ;$3)
- C_LONGINT:C283(Rgx_SubstituteText ;$4)
+ _O_C_LONGINT:C283(Rgx_SubstituteText; $0)
+ _O_C_TEXT:C284(Rgx_SubstituteText; $1)
+ _O_C_TEXT:C284(Rgx_SubstituteText; $2)
+ _O_C_POINTER:C301(Rgx_SubstituteText; $3)
+ _O_C_LONGINT:C283(Rgx_SubstituteText; $4)
- //Private ----------------------------
- C_TEXT:C284(rgx_Options ;$0)
- C_LONGINT:C283(rgx_Options ;$1)
+ // Private ----------------------------
+ _O_C_TEXT:C284(rgx_Options; $0)
+ _O_C_LONGINT:C283(rgx_Options; $1)
End if
\ No newline at end of file
diff --git a/Project/Sources/Methods/Color_main.4dm b/Project/Sources/Methods/Color_main.4dm
index 840154d..19b6952 100644
--- a/Project/Sources/Methods/Color_main.4dm
+++ b/Project/Sources/Methods/Color_main.4dm
@@ -6,26 +6,14 @@
// Description
//
// ----------------------------------------------------
-C_TEXT:C284($1)
+#DECLARE($Txt_entryPoint : Text)
-C_BLOB:C604($x)
-C_BOOLEAN:C305($Boo_White)
-C_LONGINT:C283($Lon_column; $Lon_currentPage; $Lon_formEvent; $Lon_i; $Lon_index; $Lon_line)
-C_LONGINT:C283($Lon_parameters; $Lon_timerEvent; $Lon_windowRef)
-C_PICTURE:C286($p)
-C_TEXT:C284($Txt_color; $Txt_ColorThemeCode; $Txt_entryPoint; $Dom_svg; $t)
-
-If (False:C215)
- C_TEXT:C284(Color_main; $1)
-End if
-
-$Lon_parameters:=Count parameters:C259
-
-If ($Lon_parameters>=1)
-
- $Txt_entryPoint:=$1
-
-End if
+var $Dom_svg; $t; $Txt_color; $Txt_ColorThemeCode : Text
+var $p : Picture
+var $Boo_White : Boolean
+var $Lon_column; $Lon_currentPage; $Lon_formEvent; $Lon_i; $Lon_index; $Lon_line : Integer
+var $Lon_timerEvent; $Lon_windowRef : Integer
+var $x : Blob
Case of
@@ -40,13 +28,14 @@ Case of
//……………………………………………………………………
Else
- //This method must be executed in a new process
+ // This method must be executed in a new process
BRING TO FRONT:C326(New process:C317(Current method name:C684; 0; "$"+Current method name:C684; "_run"; *))
//……………………………………………………………………
End case
//___________________________________________________________
+
: ($Txt_entryPoint="onDrag")
LISTBOX GET CELL POSITION:C971(<>tBoo_listbox; $Lon_column; $Lon_line)
@@ -62,6 +51,7 @@ Case of
End if
SET TEXT TO PASTEBOARD:C523("\""+$Txt_color+"\"")
+
$Dom_svg:=SVG_New(40; 40)
$t:=SVG_New_rect($Dom_svg; 0; 0; 40; 40; 0; 0; "none"; $Txt_color; 0)
$p:=SVG_Export_to_picture($Dom_svg)
@@ -71,6 +61,7 @@ Case of
End if
//___________________________________________________________
+
: ($Txt_entryPoint="formMethod")
$Lon_formEvent:=Form event code:C388
@@ -88,7 +79,7 @@ Case of
Case of
//.....................................................
- : ($Lon_timerEvent=-1) //INIT
+ : ($Lon_timerEvent=-1) // INIT
ARRAY PICTURE:C279(<>tPic_Colors; 0x0000)
ARRAY TEXT:C222(<>tTxt_colorNames; 0x0000)
@@ -97,20 +88,20 @@ Case of
$Dom_svg:=SVG_New(245; 30)
$t:=SVG_New_rect($Dom_svg; 0; 0; 245; 30; 0; 0; "none"; "none"; 0)
- $t:=SVG_New_text($Dom_svg; Get localized string:C991("ColorTheme_"+String:C10($Lon_i)); 5; 8; "'lucida grande' 'arial'"; 12; Bold:K14:2; Align left:K42:2; "cadetblue")
+ $t:=SVG_New_text($Dom_svg; Localized string:C991("ColorTheme_"+String:C10($Lon_i)); 5; 8; "'lucida grande' 'arial'"; 12; Bold:K14:2; Align left:K42:2; "cadetblue")
$p:=SVG_Export_to_picture($Dom_svg)
SVG_CLEAR($Dom_svg)
APPEND TO ARRAY:C911(<>tPic_Colors; $p)
APPEND TO ARRAY:C911(<>tTxt_colorNames; "")
- $Txt_ColorThemeCode:=Get localized string:C991("ColorThemeCode_"+String:C10($Lon_i))
+ $Txt_ColorThemeCode:=Localized string:C991("ColorThemeCode_"+String:C10($Lon_i))
$Lon_index:=0
Repeat
$Lon_index:=$Lon_index+1
- $Txt_color:=Get localized string:C991($Txt_ColorThemeCode+String:C10($Lon_index; "00"))
+ $Txt_color:=Localized string:C991($Txt_ColorThemeCode+String:C10($Lon_index; "00"))
If (OK=1)
@@ -126,6 +117,7 @@ Case of
End if
APPEND TO ARRAY:C911(<>tTxt_colorNames; $Txt_color)
+
$Dom_svg:=SVG_New(245; 30)
$t:=SVG_New_rect($Dom_svg; 0; 0; 245; 28; 0; 0; $Txt_color; $Txt_color; 0)
@@ -157,7 +149,7 @@ Case of
<>Lon_timerEvent:=1
//.....................................................
- : ($Lon_timerEvent=1) //Display
+ : ($Lon_timerEvent=1) // Display
//.....................................................
Else
@@ -172,6 +164,7 @@ Case of
End if
//……………………………………………………………………………
+
: ($Lon_formEvent=On Resize:K2:27)
//……………………………………………………………………………
@@ -199,6 +192,7 @@ Case of
End case
//___________________________________________________________
+
: ($Txt_entryPoint="_run")
// First launch of this method executed in a new process
diff --git a/Project/Sources/Methods/Compiler_SVG.4dm b/Project/Sources/Methods/Compiler_SVG.4dm
index f625152..69de7cf 100644
--- a/Project/Sources/Methods/Compiler_SVG.4dm
+++ b/Project/Sources/Methods/Compiler_SVG.4dm
@@ -1,106 +1,46 @@
//%attributes = {"invisible":true,"preemptive":"capable"}
- // ----------------------------------------------------
- // Method : Compiler_SVG
- // Created 16/06/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- // The goal of this method is to group all declarations
- // and initialisations for a good execution of the component
- // ----------------------------------------------------
-
- //===============================
- // %W-518.7
- // %W-518.1
- // %W-518.5
- // %W-529.17
- //===============================
-
-C_BOOLEAN:C305($1)
-
-C_BOOLEAN:C305($Boo_init)
-
-If (Count parameters:C259>0)
-
- $Boo_init:=$1
-
-End if
-
- //The use of this sequence makes the test valide in code both interpreted and compiled {
- //$Boo_init:=($Boo_init | (<>svg_Boo_Inited=Undefined))
- //C_BOOLEAN(<>svg_Boo_Inited)
- //$Boo_init:=($Boo_init | Not(<>svg_Boo_Inited))
- //}
-
- // ----------------------------------------------------
- //Process variables
-C_LONGINT:C283(SVG_Lon_Error)
-C_TEXT:C284(SVG_Txt_Command)
-
- // ----------------------------------------------------
+// ----------------------------------------------------
+// Method : Compiler_SVG
+// Created 16/06/08 by Vincent de Lachaux
+// ----------------------------------------------------
+// Description
+// The goal of this method is to group all declarations
+// And initialisations for a good execution of the component
+// ----------------------------------------------------
+#DECLARE($Boo_init : Boolean)
+
+var SVG_Lon_Error : Integer
+var SVG_Txt_Command : Text
If (($Boo_init | (Storage:C1525.svg=Null:C1517)))
- // ----------------------------------------------------
- //INITIALISATION
- // The method must return true or false in accordance with the success of initialisation.
- // The method manages, if necessary, of the update of the stored datas according to the version number
+ // The method must return true or false in accordance with the success of initialisation.
+ // The method manages, if necessary, of the update of the stored datas according to the version number
- If (Component_init )
+ If (Component_init)
- // ----------------------------------------------------
- //USES {
- //Compiler_SVG_Public
- //Compiler_SVG_Private
- //}
- // ----------------------------------------------------
- //Interprocess variables {
- // ----------------------------------------------------
- //C_TEXT(<>SVG_Encoding)
- //Component options {
- //C_LONGINT(<>SVG_Lon_Options)
- //bit 00 = RESERVED
- //bit 01 = Dont automatically assign ID
- //bit 02 = Do not automatically close objects drawn
- //bit 03 = Background
- //bit 04 = Absolute coordinate (versus relative)
- //bit 05 = indentation
- //bit 06 = BEEP on error
- //bit 07 = Mode debug : Don't install the error-catching method
- //bit 08 = Image avec fond
- //bit 09 = Origine trigo
- //bit 10 = Substitute 'Arial Unicode MS' to 'Arial'
- //bit 11 = Set shape-rendering='crispEdges' as default for a new canvas
- //bit 12 = NO ERROR
- //}
- //Default values {
- //C_TEXT(<>kTxt_strokeColor)
- //C_TEXT(<>kTxt_fillColor)
- //}
- //C_LONGINT(<>SVG_Lon_Error)
- //C_TEXT(<>SVG_Txt_Current_Error_Method)
- //C_TEXT(<>SVG_Txt_Host_Error_Method)
- //C_TEXT(<>kTxt_fe_inValues)
- //C_TEXT(<>kTxt_fe_in2Values)
- //C_TEXT(<>kTxt_feComposite_operatorValues)
- //C_TEXT(<>kTxt_feColorMatrix_typeValues)
- //<4DPop>
- //
- // ----------------------------------------------------
- //Interprocess arrays {
- // ----------------------------------------------------
- //The last error occured for a document
- //(in ◊svg_tLon_Errors{0} contains the last error occurred)
- //ARRAY LONGINT(<>svg_tLon_Errors;0)
- //}
- // ----------------------------------------------------
+ // Component options
+ // C_LONGINT(<>SVG_Lon_Options)
+ // Bit 00 = RESERVED
+ // Bit 01 = Dont automatically assign ID
+ // Bit 02 = Do not automatically close objects drawn
+ // Bit 03 = Background
+ // Bit 04 = Absolute coordinate (versus relative)
+ // Bit 05 = indentation
+ // Bit 06 = BEEP on error
+ // Bit 07 = Mode debug : Don't install the error-catching method
+ // Bit 08 = Image avec fond
+ // Bit 09 = Origine trigo
+ // Bit 10 = Substitute 'Arial Unicode MS' to 'Arial'
+ // Bit 11 = Set shape-rendering='crispEdges' as default for a new canvas
+ // Bit 12 = NO ERROR
Else
- //Alert or quit if initialisation fails {
+ // Alert or quit if initialisation fails
- //}
End if
End if
- // Added by Vincent de Lachaux (11/04/12)
-SVG_SET_OPTIONS (Storage:C1525.svg.options)
\ No newline at end of file
+// Added by Vincent de Lachaux (11/04/12)
+SVG_SET_OPTIONS(Storage:C1525.svg.options)
\ No newline at end of file
diff --git a/Project/Sources/Methods/Compiler_SVG_Private.4dm b/Project/Sources/Methods/Compiler_SVG_Private.4dm
index 6c63a5f..82852a5 100644
--- a/Project/Sources/Methods/Compiler_SVG_Private.4dm
+++ b/Project/Sources/Methods/Compiler_SVG_Private.4dm
@@ -7,72 +7,72 @@
If (False:C215)
// ----------------------------------------------------
- C_TEXT:C284(svg_relativeURL; $0)
- C_POINTER:C301(svg_relativeURL; $1)
+ //_O_C_TEXT(svg_relativeURL; $0)
+ //_O_C_POINTER(svg_relativeURL; $1)
// ----------------------------------------------------
- C_TEXT:C284(url_encode; $0)
- C_TEXT:C284(url_encode; $1)
+ //_O_C_TEXT(url_encode; $0)
+ //_O_C_TEXT(url_encode; $1)
// ----------------------------------------------------
- C_TEXT:C284(url_decode; $0)
- C_TEXT:C284(url_decode; $1)
+ //_O_C_TEXT(url_decode; $0)
+ //_O_C_TEXT(url_decode; $1)
// ----------------------------------------------------
- C_BOOLEAN:C305(Compiler_SVG; $1)
+ //_O_C_BOOLEAN(Compiler_SVG; $1)
// ----------------------------------------------------
- C_TEXT:C284(Component_about; $1)
+ //_O_C_TEXT(Component_about; $1)
// ----------------------------------------------------
- C_LONGINT:C283(Component_defaultOptions; $0)
+ //_O_C_LONGINT(Component_defaultOptions; $0)
// ----------------------------------------------------
- C_BOOLEAN:C305(Component_errorHandler; $0)
- C_TEXT:C284(Component_errorHandler; $1)
- C_TEXT:C284(Component_errorHandler; $2)
- C_TEXT:C284(Component_errorHandler; $3)
+ _O_C_BOOLEAN:C305(Component_errorHandler; $0)
+ _O_C_TEXT:C284(Component_errorHandler; $1)
+ _O_C_TEXT:C284(Component_errorHandler; $2)
+ _O_C_TEXT:C284(Component_errorHandler; $3)
// ----------------------------------------------------
- C_BOOLEAN:C305(Component_init; $0)
+ //_O_C_BOOLEAN(Component_init; $0)
// ----------------------------------------------------
- C_TEXT:C284(fontReplaceArial; $0)
- C_TEXT:C284(fontReplaceArial; $1)
+ _O_C_TEXT:C284(fontReplaceArial; $0)
+ _O_C_TEXT:C284(fontReplaceArial; $1)
// ----------------------------------------------------
- C_BOOLEAN:C305(str_styledText; $0)
- C_TEXT:C284(str_styledText; $1)
+ _O_C_BOOLEAN:C305(str_styledText; $0)
+ _O_C_TEXT:C284(str_styledText; $1)
// ----------------------------------------------------
- C_REAL:C285(SVG_Get_string_width; $0)
- C_TEXT:C284(SVG_Get_string_width; $1)
- C_TEXT:C284(SVG_Get_string_width; $2)
- C_LONGINT:C283(SVG_Get_string_width; $3)
- C_LONGINT:C283(SVG_Get_string_width; $4)
+ _O_C_REAL:C285(SVG_Get_string_width; $0)
+ _O_C_TEXT:C284(SVG_Get_string_width; $1)
+ _O_C_TEXT:C284(SVG_Get_string_width; $2)
+ _O_C_LONGINT:C283(SVG_Get_string_width; $3)
+ _O_C_LONGINT:C283(SVG_Get_string_width; $4)
// ----------------------------------------------------
- C_TEXT:C284(xToolbox_GetLastItemFromPath; $0)
- C_TEXT:C284(xToolbox_GetLastItemFromPath; $1)
- C_TEXT:C284(xToolbox_GetLastItemFromPath; $2)
+ //_O_C_TEXT(xToolbox_GetLastItemFromPath; $0)
+ //_O_C_TEXT(xToolbox_GetLastItemFromPath; $1)
+ //_O_C_TEXT(xToolbox_GetLastItemFromPath; $2)
// ----------------------------------------------------
- C_BOOLEAN:C305(Component_putError; $0)
- C_LONGINT:C283(Component_putError; $1)
- C_TEXT:C284(Component_putError; $2)
+ _O_C_BOOLEAN:C305(Component_putError; $0)
+ _O_C_LONGINT:C283(Component_putError; $1)
+ _O_C_TEXT:C284(Component_putError; $2)
// ----------------------------------------------------
- C_TEXT:C284(xToolBox_RELEASE_MENU; $1)
+ //_O_C_TEXT(xToolBox_RELEASE_MENU; $1)
// ----------------------------------------------------
- C_TEXT:C284(PREFERENCES; $1)
- C_POINTER:C301(PREFERENCES; ${2})
+ _O_C_TEXT:C284(PREFERENCES; $1)
+ _O_C_POINTER:C301(PREFERENCES; ${2})
// ----------------------------------------------------
- C_TEXT:C284(setFontStyles; $1)
- C_LONGINT:C283(setFontStyles; $2)
+ _O_C_TEXT:C284(setFontStyles; $1)
+ _O_C_LONGINT:C283(setFontStyles; $2)
// ----------------------------------------------------
End if
\ No newline at end of file
diff --git a/Project/Sources/Methods/Compiler_SVG_Public.4dm b/Project/Sources/Methods/Compiler_SVG_Public.4dm
index be28ae1..e2bc6c6 100644
--- a/Project/Sources/Methods/Compiler_SVG_Public.4dm
+++ b/Project/Sources/Methods/Compiler_SVG_Public.4dm
@@ -1,939 +1,939 @@
//%attributes = {"invisible":true,"preemptive":"capable"}
- // ----------------------------------------------------
- // Method : Compiler_SVG_Public
- // Created 04/07/08 by Vincent de Lachaux
- // ----------------------------------------------------
+// ----------------------------------------------------
+// Method : Compiler_SVG_Public
+// Created 04/07/08 by Vincent de Lachaux
+// ----------------------------------------------------
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
- //Document
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//Document
+//:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
If (False:C215)
- //SVG_SET_DEFAULT_ENCODING
- C_TEXT:C284(SVG_SET_DEFAULT_ENCODING ;$1)
+ //SVG_SET_DEFAULT_ENCODING
+ _O_C_TEXT:C284(SVG_SET_DEFAULT_ENCODING; $1)
- //SVG_Get_default_encoding
- C_TEXT:C284(SVG_Get_default_encoding ;$0)
+ //SVG_Get_default_encoding
+ _O_C_TEXT:C284(SVG_Get_default_encoding; $0)
- //SVG_CLEAR
- C_TEXT:C284(SVG_CLEAR ;$1)
+ //SVG_CLEAR
+ _O_C_TEXT:C284(SVG_CLEAR; $1)
- //SVG_Copy
- C_TEXT:C284(SVG_Copy ;$0)
- C_TEXT:C284(SVG_Copy ;$1)
+ //SVG_Copy
+ _O_C_TEXT:C284(SVG_Copy; $0)
+ _O_C_TEXT:C284(SVG_Copy; $1)
- //SVG_Export_to_picture
- C_PICTURE:C286(SVG_Export_to_picture ;$0)
- C_TEXT:C284(SVG_Export_to_picture ;$1)
- C_LONGINT:C283(SVG_Export_to_picture ;$2)
+ //SVG_Export_to_picture
+ _O_C_PICTURE:C286(SVG_Export_to_picture; $0)
+ _O_C_TEXT:C284(SVG_Export_to_picture; $1)
+ _O_C_LONGINT:C283(SVG_Export_to_picture; $2)
- //SVG_Export_to_XML
- C_TEXT:C284(SVG_Export_to_XML ;$0)
- C_TEXT:C284(SVG_Export_to_XML ;$1)
+ //SVG_Export_to_XML
+ _O_C_TEXT:C284(SVG_Export_to_XML; $0)
+ _O_C_TEXT:C284(SVG_Export_to_XML; $1)
- //SVG_New
- C_TEXT:C284(SVG_New ;$0)
- C_REAL:C285(SVG_New ;$1)
- C_REAL:C285(SVG_New ;$2)
- C_TEXT:C284(SVG_New ;$3)
- C_TEXT:C284(SVG_New ;$4)
- C_BOOLEAN:C305(SVG_New ;$5)
- C_LONGINT:C283(SVG_New ;$6)
+ //SVG_New
+ _O_C_TEXT:C284(SVG_New; $0)
+ _O_C_REAL:C285(SVG_New; $1)
+ _O_C_REAL:C285(SVG_New; $2)
+ _O_C_TEXT:C284(SVG_New; $3)
+ _O_C_TEXT:C284(SVG_New; $4)
+ _O_C_BOOLEAN:C305(SVG_New; $5)
+ _O_C_LONGINT:C283(SVG_New; $6)
- //SVG_Open_file
- C_TEXT:C284(SVG_Open_file ;$0)
- C_TEXT:C284(SVG_Open_file ;$1)
- C_BOOLEAN:C305(SVG_Open_file ;$2)
+ //SVG_Open_file
+ _O_C_TEXT:C284(SVG_Open_file; $0)
+ _O_C_TEXT:C284(SVG_Open_file; $1)
+ _O_C_BOOLEAN:C305(SVG_Open_file; $2)
- //SVG_Open_picture
- C_TEXT:C284(SVG_Open_picture ;$0)
- C_PICTURE:C286(SVG_Open_picture ;$1)
+ //SVG_Open_picture
+ _O_C_TEXT:C284(SVG_Open_picture; $0)
+ _O_C_PICTURE:C286(SVG_Open_picture; $1)
- //SVG_SAVE_AS_PICTURE
- C_TEXT:C284(SVG_SAVE_AS_PICTURE ;$1)
- C_TEXT:C284(SVG_SAVE_AS_PICTURE ;$2)
- C_TEXT:C284(SVG_SAVE_AS_PICTURE ;$3)
+ //SVG_SAVE_AS_PICTURE
+ _O_C_TEXT:C284(SVG_SAVE_AS_PICTURE; $1)
+ _O_C_TEXT:C284(SVG_SAVE_AS_PICTURE; $2)
+ _O_C_TEXT:C284(SVG_SAVE_AS_PICTURE; $3)
- //SVG_SAVE_AS_TEXT
- C_TEXT:C284(SVG_SAVE_AS_TEXT ;$1)
- C_TEXT:C284(SVG_SAVE_AS_TEXT ;$2)
+ //SVG_SAVE_AS_TEXT
+ _O_C_TEXT:C284(SVG_SAVE_AS_TEXT; $1)
+ _O_C_TEXT:C284(SVG_SAVE_AS_TEXT; $2)
- //SVG_Validate_file
- C_BOOLEAN:C305(SVG_Validate_file ;$0)
- C_TEXT:C284(SVG_Validate_file ;$1)
+ //SVG_Validate_file
+ _O_C_BOOLEAN:C305(SVG_Validate_file; $0)
+ _O_C_TEXT:C284(SVG_Validate_file; $1)
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
End if
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
- //Structure & definition
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//Structure & definition
+//:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
If (False:C215)
- //SVG_ADD_NAME_SPACE
- C_TEXT:C284(SVG_ADD_NAMESPACE ;$1)
- C_TEXT:C284(SVG_ADD_NAMESPACE ;$2)
- C_TEXT:C284(SVG_ADD_NAMESPACE ;$3)
-
- //SVG_Define_clip_Path
- C_TEXT:C284(SVG_Define_clip_Path ;$0)
- C_TEXT:C284(SVG_Define_clip_Path ;$1)
- C_TEXT:C284(SVG_Define_clip_Path ;$2)
-
- //SVG_Define_solidColor
- C_TEXT:C284(SVG_Define_solidColor ;$0)
- C_TEXT:C284(SVG_Define_solidColor ;$1)
- C_TEXT:C284(SVG_Define_solidColor ;$2)
- C_TEXT:C284(SVG_Define_solidColor ;$3)
- C_LONGINT:C283(SVG_Define_solidColor ;$4)
-
- //SVG_Define_filter
- C_TEXT:C284(SVG_Define_filter ;$0)
- C_TEXT:C284(SVG_Define_filter ;$1)
- C_TEXT:C284(SVG_Define_filter ;$2)
- C_REAL:C285(SVG_Define_filter ;$3)
- C_REAL:C285(SVG_Define_filter ;$4)
- C_REAL:C285(SVG_Define_filter ;$5)
- C_REAL:C285(SVG_Define_filter ;$6)
- C_TEXT:C284(SVG_Define_filter ;$7)
- C_TEXT:C284(SVG_Define_filter ;$8)
-
- //SVG_Define_shadow
- C_TEXT:C284(SVG_Define_shadow ;$0)
- C_TEXT:C284(SVG_Define_shadow ;$1)
- C_TEXT:C284(SVG_Define_shadow ;$2)
- C_LONGINT:C283(SVG_Define_shadow ;$3)
- C_LONGINT:C283(SVG_Define_shadow ;$4)
- C_LONGINT:C283(SVG_Define_shadow ;$5)
-
- //SVG_Define_gradient_l_by_arrays
- C_TEXT:C284(SVG_Define_gradient_l_by_arrays ;$1)
- C_TEXT:C284(SVG_Define_gradient_l_by_arrays ;$2)
- C_LONGINT:C283(SVG_Define_gradient_l_by_arrays ;$3)
- C_LONGINT:C283(SVG_Define_gradient_l_by_arrays ;$4)
- C_LONGINT:C283(SVG_Define_gradient_l_by_arrays ;$5)
- C_LONGINT:C283(SVG_Define_gradient_l_by_arrays ;$6)
- C_TEXT:C284(SVG_Define_gradient_l_by_arrays ;${7})
-
- //SVG_Define_gradient_r_by_arrays
- C_TEXT:C284(SVG_Define_gradient_r_by_arrays ;$1)
- C_TEXT:C284(SVG_Define_gradient_r_by_arrays ;$2)
- C_LONGINT:C283(SVG_Define_gradient_r_by_arrays ;$3)
- C_LONGINT:C283(SVG_Define_gradient_r_by_arrays ;$4)
- C_LONGINT:C283(SVG_Define_gradient_r_by_arrays ;$5)
- C_LONGINT:C283(SVG_Define_gradient_r_by_arrays ;$6)
- C_LONGINT:C283(SVG_Define_gradient_r_by_arrays ;$7)
- C_TEXT:C284(SVG_Define_gradient_r_by_arrays ;${8})
-
- //SVG_Define_image
- C_TEXT:C284(SVG_Define_image ;$0)
- C_TEXT:C284(SVG_Define_image ;$1)
- C_TEXT:C284(SVG_Define_image ;$2)
- C_PICTURE:C286(SVG_Define_image ;$3)
- C_TEXT:C284(SVG_Define_image ;$4)
-
- //SVG_Define_linear_gradient
- C_TEXT:C284(SVG_Define_linear_gradient ;$0)
- C_TEXT:C284(SVG_Define_linear_gradient ;$1)
- C_TEXT:C284(SVG_Define_linear_gradient ;$2)
- C_TEXT:C284(SVG_Define_linear_gradient ;$3)
- C_TEXT:C284(SVG_Define_linear_gradient ;$4)
- C_LONGINT:C283(SVG_Define_linear_gradient ;$5)
- C_TEXT:C284(SVG_Define_linear_gradient ;$6)
- C_REAL:C285(SVG_Define_linear_gradient ;${7}) //C_REEL(SVG_Define_linear_gradient ;${-1})
-
- //SVG_Define_pattern
- C_TEXT:C284(SVG_Define_pattern ;$0)
- C_TEXT:C284(SVG_Define_pattern ;$1)
- C_TEXT:C284(SVG_Define_pattern ;$2)
- C_REAL:C285(SVG_Define_pattern ;$3)
- C_REAL:C285(SVG_Define_pattern ;$4)
- C_REAL:C285(SVG_Define_pattern ;$5)
- C_REAL:C285(SVG_Define_pattern ;$6)
- C_TEXT:C284(SVG_Define_pattern ;$7)
- C_TEXT:C284(SVG_Define_pattern ;$8)
-
- //SVG_Define_radial_gradient
- C_TEXT:C284(SVG_Define_radial_gradient ;$0)
- C_TEXT:C284(SVG_Define_radial_gradient ;$1)
- C_TEXT:C284(SVG_Define_radial_gradient ;$2)
- C_TEXT:C284(SVG_Define_radial_gradient ;$3)
- C_TEXT:C284(SVG_Define_radial_gradient ;$4)
- C_LONGINT:C283(SVG_Define_radial_gradient ;$5)
- C_LONGINT:C283(SVG_Define_radial_gradient ;$6)
- C_LONGINT:C283(SVG_Define_radial_gradient ;$7)
- C_LONGINT:C283(SVG_Define_radial_gradient ;$8)
- C_LONGINT:C283(SVG_Define_radial_gradient ;$9)
- C_TEXT:C284(SVG_Define_radial_gradient ;$10)
-
- //SVG_Define_marker
- C_TEXT:C284(SVG_Define_marker ;$0)
- C_TEXT:C284(SVG_Define_marker ;$1)
- C_TEXT:C284(SVG_Define_marker ;$2)
- C_REAL:C285(SVG_Define_marker ;$3)
- C_REAL:C285(SVG_Define_marker ;$4)
- C_REAL:C285(SVG_Define_marker ;$5)
- C_REAL:C285(SVG_Define_marker ;$6)
- C_REAL:C285(SVG_Define_marker ;$7)
- C_TEXT:C284(SVG_Define_marker ;$8)
-
- //SVG_Define_style
- C_TEXT:C284(SVG_Define_style ;$0)
- C_TEXT:C284(SVG_Define_style ;$1)
- C_TEXT:C284(SVG_Define_style ;$2)
- C_TEXT:C284(SVG_Define_style ;$3)
- C_TEXT:C284(SVG_Define_style ;$4)
- C_TEXT:C284(SVG_Define_style ;$5)
-
- //SVG_Define_style_with_arrays
- C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS ;$0)
- C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS ;$1)
- C_POINTER:C301(SVG_DEFINE_STYLE_WITH_ARRAYS ;$2)
- C_POINTER:C301(SVG_DEFINE_STYLE_WITH_ARRAYS ;$3)
- C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS ;$4)
- C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS ;$5)
- C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS ;$6)
- C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS ;$7)
-
- //SVG_Define_symbol
- C_TEXT:C284(SVG_Define_symbol ;$0)
- C_TEXT:C284(SVG_Define_symbol ;$1)
- C_TEXT:C284(SVG_Define_symbol ;$2)
- C_REAL:C285(SVG_Define_symbol ;$3)
- C_REAL:C285(SVG_Define_symbol ;$4)
- C_REAL:C285(SVG_Define_symbol ;$5)
- C_REAL:C285(SVG_Define_symbol ;$6)
- C_TEXT:C284(SVG_Define_symbol ;$7)
-
- //SVG_Define_symbol_from_file
- C_TEXT:C284(SVG_Define_symbol_from_file ;$0)
- C_TEXT:C284(SVG_Define_symbol_from_file ;$1)
- C_TEXT:C284(SVG_Define_symbol_from_file ;$2)
- C_TEXT:C284(SVG_Define_symbol_from_file ;$3)
- C_REAL:C285(SVG_Define_symbol_from_file ;$4)
- C_REAL:C285(SVG_Define_symbol_from_file ;$5)
- C_REAL:C285(SVG_Define_symbol_from_file ;$6)
- C_REAL:C285(SVG_Define_symbol_from_file ;$7)
- C_TEXT:C284(SVG_Define_symbol_from_file ;$8)
-
- //SVG_DELETE_OBJECT
- C_TEXT:C284(SVG_DELETE_OBJECT ;$1)
-
- //SVG_Get_root_reference
- C_TEXT:C284(SVG_Get_root_reference ;$0)
- C_TEXT:C284(SVG_Get_root_reference ;$1)
-
- //SVG_New_group
- C_TEXT:C284(SVG_New_group ;$0)
- C_TEXT:C284(SVG_New_group ;$1)
- C_TEXT:C284(SVG_New_group ;$2)
- C_TEXT:C284(SVG_New_group ;$3)
- C_TEXT:C284(SVG_New_group ;$4)
-
- //SVG_Post_comment
- C_TEXT:C284(SVG_Post_comment ;$0)
- C_TEXT:C284(SVG_Post_comment ;$1)
- C_TEXT:C284(SVG_Post_comment ;$2)
-
- //SVG_Set_description
- C_TEXT:C284(SVG_Set_description ;$0)
- C_TEXT:C284(SVG_Set_description ;$1)
- C_TEXT:C284(SVG_Set_description ;$2)
-
- //SVG_SET_PATTERN_CONTENT_UNITS
- C_TEXT:C284(SVG_SET_PATTERN_CONTENT_UNITS ;$1)
- C_TEXT:C284(SVG_SET_PATTERN_CONTENT_UNITS ;$2)
-
- //SVG_SET_PATTERN_UNITS
- C_TEXT:C284(SVG_SET_PATTERN_UNITS ;$1)
- C_TEXT:C284(SVG_SET_PATTERN_UNITS ;$2)
-
- //SVG_Set_title
- C_TEXT:C284(SVG_Set_title ;$0)
- C_TEXT:C284(SVG_Set_title ;$1)
- C_TEXT:C284(SVG_Set_title ;$2)
-
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ //SVG_ADD_NAME_SPACE
+ _O_C_TEXT:C284(SVG_ADD_NAMESPACE; $1)
+ _O_C_TEXT:C284(SVG_ADD_NAMESPACE; $2)
+ _O_C_TEXT:C284(SVG_ADD_NAMESPACE; $3)
+
+ //SVG_Define_clip_Path
+ _O_C_TEXT:C284(SVG_Define_clip_Path; $0)
+ _O_C_TEXT:C284(SVG_Define_clip_Path; $1)
+ _O_C_TEXT:C284(SVG_Define_clip_Path; $2)
+
+ //SVG_Define_solidColor
+ _O_C_TEXT:C284(SVG_Define_solidColor; $0)
+ _O_C_TEXT:C284(SVG_Define_solidColor; $1)
+ _O_C_TEXT:C284(SVG_Define_solidColor; $2)
+ _O_C_TEXT:C284(SVG_Define_solidColor; $3)
+ _O_C_LONGINT:C283(SVG_Define_solidColor; $4)
+
+ //SVG_Define_filter
+ _O_C_TEXT:C284(SVG_Define_filter; $0)
+ _O_C_TEXT:C284(SVG_Define_filter; $1)
+ _O_C_TEXT:C284(SVG_Define_filter; $2)
+ _O_C_REAL:C285(SVG_Define_filter; $3)
+ _O_C_REAL:C285(SVG_Define_filter; $4)
+ _O_C_REAL:C285(SVG_Define_filter; $5)
+ _O_C_REAL:C285(SVG_Define_filter; $6)
+ _O_C_TEXT:C284(SVG_Define_filter; $7)
+ _O_C_TEXT:C284(SVG_Define_filter; $8)
+
+ //SVG_Define_shadow
+ _O_C_TEXT:C284(SVG_Define_shadow; $0)
+ _O_C_TEXT:C284(SVG_Define_shadow; $1)
+ _O_C_TEXT:C284(SVG_Define_shadow; $2)
+ _O_C_LONGINT:C283(SVG_Define_shadow; $3)
+ _O_C_LONGINT:C283(SVG_Define_shadow; $4)
+ _O_C_LONGINT:C283(SVG_Define_shadow; $5)
+
+ //SVG_Define_gradient_l_by_arrays
+ _O_C_TEXT:C284(SVG_Define_gradient_l_by_arrays; $1)
+ _O_C_TEXT:C284(SVG_Define_gradient_l_by_arrays; $2)
+ _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $3)
+ _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $4)
+ _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $5)
+ _O_C_LONGINT:C283(SVG_Define_gradient_l_by_arrays; $6)
+ _O_C_TEXT:C284(SVG_Define_gradient_l_by_arrays; ${7})
+
+ //SVG_Define_gradient_r_by_arrays
+ _O_C_TEXT:C284(SVG_Define_gradient_r_by_arrays; $1)
+ _O_C_TEXT:C284(SVG_Define_gradient_r_by_arrays; $2)
+ _O_C_LONGINT:C283(SVG_Define_gradient_r_by_arrays; $3)
+ _O_C_LONGINT:C283(SVG_Define_gradient_r_by_arrays; $4)
+ _O_C_LONGINT:C283(SVG_Define_gradient_r_by_arrays; $5)
+ _O_C_LONGINT:C283(SVG_Define_gradient_r_by_arrays; $6)
+ _O_C_LONGINT:C283(SVG_Define_gradient_r_by_arrays; $7)
+ _O_C_TEXT:C284(SVG_Define_gradient_r_by_arrays; ${8})
+
+ //SVG_Define_image
+ _O_C_TEXT:C284(SVG_Define_image; $0)
+ _O_C_TEXT:C284(SVG_Define_image; $1)
+ _O_C_TEXT:C284(SVG_Define_image; $2)
+ _O_C_PICTURE:C286(SVG_Define_image; $3)
+ _O_C_TEXT:C284(SVG_Define_image; $4)
+
+ //SVG_Define_linear_gradient
+ _O_C_TEXT:C284(SVG_Define_linear_gradient; $0)
+ _O_C_TEXT:C284(SVG_Define_linear_gradient; $1)
+ _O_C_TEXT:C284(SVG_Define_linear_gradient; $2)
+ _O_C_TEXT:C284(SVG_Define_linear_gradient; $3)
+ _O_C_TEXT:C284(SVG_Define_linear_gradient; $4)
+ _O_C_LONGINT:C283(SVG_Define_linear_gradient; $5)
+ _O_C_TEXT:C284(SVG_Define_linear_gradient; $6)
+ _O_C_REAL:C285(SVG_Define_linear_gradient; ${7}) //C_REEL(SVG_Define_linear_gradient ;${-1})
+
+ //SVG_Define_pattern
+ _O_C_TEXT:C284(SVG_Define_pattern; $0)
+ _O_C_TEXT:C284(SVG_Define_pattern; $1)
+ _O_C_TEXT:C284(SVG_Define_pattern; $2)
+ _O_C_REAL:C285(SVG_Define_pattern; $3)
+ _O_C_REAL:C285(SVG_Define_pattern; $4)
+ _O_C_REAL:C285(SVG_Define_pattern; $5)
+ _O_C_REAL:C285(SVG_Define_pattern; $6)
+ _O_C_TEXT:C284(SVG_Define_pattern; $7)
+ _O_C_TEXT:C284(SVG_Define_pattern; $8)
+
+ //SVG_Define_radial_gradient
+ _O_C_TEXT:C284(SVG_Define_radial_gradient; $0)
+ _O_C_TEXT:C284(SVG_Define_radial_gradient; $1)
+ _O_C_TEXT:C284(SVG_Define_radial_gradient; $2)
+ _O_C_TEXT:C284(SVG_Define_radial_gradient; $3)
+ _O_C_TEXT:C284(SVG_Define_radial_gradient; $4)
+ _O_C_LONGINT:C283(SVG_Define_radial_gradient; $5)
+ _O_C_LONGINT:C283(SVG_Define_radial_gradient; $6)
+ _O_C_LONGINT:C283(SVG_Define_radial_gradient; $7)
+ _O_C_LONGINT:C283(SVG_Define_radial_gradient; $8)
+ _O_C_LONGINT:C283(SVG_Define_radial_gradient; $9)
+ _O_C_TEXT:C284(SVG_Define_radial_gradient; $10)
+
+ //SVG_Define_marker
+ _O_C_TEXT:C284(SVG_Define_marker; $0)
+ _O_C_TEXT:C284(SVG_Define_marker; $1)
+ _O_C_TEXT:C284(SVG_Define_marker; $2)
+ _O_C_REAL:C285(SVG_Define_marker; $3)
+ _O_C_REAL:C285(SVG_Define_marker; $4)
+ _O_C_REAL:C285(SVG_Define_marker; $5)
+ _O_C_REAL:C285(SVG_Define_marker; $6)
+ _O_C_REAL:C285(SVG_Define_marker; $7)
+ _O_C_TEXT:C284(SVG_Define_marker; $8)
+
+ //SVG_Define_style
+ _O_C_TEXT:C284(SVG_Define_style; $0)
+ _O_C_TEXT:C284(SVG_Define_style; $1)
+ _O_C_TEXT:C284(SVG_Define_style; $2)
+ _O_C_TEXT:C284(SVG_Define_style; $3)
+ _O_C_TEXT:C284(SVG_Define_style; $4)
+ _O_C_TEXT:C284(SVG_Define_style; $5)
+
+ //SVG_Define_style_with_arrays
+ _O_C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS; $0)
+ _O_C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS; $1)
+ _O_C_POINTER:C301(SVG_DEFINE_STYLE_WITH_ARRAYS; $2)
+ _O_C_POINTER:C301(SVG_DEFINE_STYLE_WITH_ARRAYS; $3)
+ _O_C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS; $4)
+ _O_C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS; $5)
+ _O_C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS; $6)
+ _O_C_TEXT:C284(SVG_DEFINE_STYLE_WITH_ARRAYS; $7)
+
+ //SVG_Define_symbol
+ _O_C_TEXT:C284(SVG_Define_symbol; $0)
+ _O_C_TEXT:C284(SVG_Define_symbol; $1)
+ _O_C_TEXT:C284(SVG_Define_symbol; $2)
+ _O_C_REAL:C285(SVG_Define_symbol; $3)
+ _O_C_REAL:C285(SVG_Define_symbol; $4)
+ _O_C_REAL:C285(SVG_Define_symbol; $5)
+ _O_C_REAL:C285(SVG_Define_symbol; $6)
+ _O_C_TEXT:C284(SVG_Define_symbol; $7)
+
+ //SVG_Define_symbol_from_file
+ _O_C_TEXT:C284(SVG_Define_symbol_from_file; $0)
+ _O_C_TEXT:C284(SVG_Define_symbol_from_file; $1)
+ _O_C_TEXT:C284(SVG_Define_symbol_from_file; $2)
+ _O_C_TEXT:C284(SVG_Define_symbol_from_file; $3)
+ _O_C_REAL:C285(SVG_Define_symbol_from_file; $4)
+ _O_C_REAL:C285(SVG_Define_symbol_from_file; $5)
+ _O_C_REAL:C285(SVG_Define_symbol_from_file; $6)
+ _O_C_REAL:C285(SVG_Define_symbol_from_file; $7)
+ _O_C_TEXT:C284(SVG_Define_symbol_from_file; $8)
+
+ //SVG_DELETE_OBJECT
+ _O_C_TEXT:C284(SVG_DELETE_OBJECT; $1)
+
+ //SVG_Get_root_reference
+ _O_C_TEXT:C284(SVG_Get_root_reference; $0)
+ _O_C_TEXT:C284(SVG_Get_root_reference; $1)
+
+ //SVG_New_group
+ _O_C_TEXT:C284(SVG_New_group; $0)
+ _O_C_TEXT:C284(SVG_New_group; $1)
+ _O_C_TEXT:C284(SVG_New_group; $2)
+ _O_C_TEXT:C284(SVG_New_group; $3)
+ _O_C_TEXT:C284(SVG_New_group; $4)
+
+ //SVG_Post_comment
+ _O_C_TEXT:C284(SVG_Post_comment; $0)
+ _O_C_TEXT:C284(SVG_Post_comment; $1)
+ _O_C_TEXT:C284(SVG_Post_comment; $2)
+
+ //SVG_Set_description
+ _O_C_TEXT:C284(SVG_Set_description; $0)
+ _O_C_TEXT:C284(SVG_Set_description; $1)
+ _O_C_TEXT:C284(SVG_Set_description; $2)
+
+ //SVG_SET_PATTERN_CONTENT_UNITS
+ _O_C_TEXT:C284(SVG_SET_PATTERN_CONTENT_UNITS; $1)
+ _O_C_TEXT:C284(SVG_SET_PATTERN_CONTENT_UNITS; $2)
+
+ //SVG_SET_PATTERN_UNITS
+ _O_C_TEXT:C284(SVG_SET_PATTERN_UNITS; $1)
+ _O_C_TEXT:C284(SVG_SET_PATTERN_UNITS; $2)
+
+ //SVG_Set_title
+ _O_C_TEXT:C284(SVG_Set_title; $0)
+ _O_C_TEXT:C284(SVG_Set_title; $1)
+ _O_C_TEXT:C284(SVG_Set_title; $2)
+
+ //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
End if
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
- //Drawing
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//Drawing
+//:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
If (False:C215)
- //SVG_Add_object
- C_TEXT:C284(SVG_Add_object ;$0)
- C_TEXT:C284(SVG_Add_object ;$1)
- C_TEXT:C284(SVG_Add_object ;$2)
-
- //SVG_ADD_POINT
- C_TEXT:C284(SVG_ADD_POINT ;$1)
- C_REAL:C285(SVG_ADD_POINT ;${2})
-
- //SVG_New_arc
- C_TEXT:C284(SVG_New_arc ;$0)
- C_TEXT:C284(SVG_New_arc ;$1)
- C_REAL:C285(SVG_New_arc ;$2)
- C_REAL:C285(SVG_New_arc ;$3)
- C_REAL:C285(SVG_New_arc ;$4)
- C_REAL:C285(SVG_New_arc ;$5)
- C_REAL:C285(SVG_New_arc ;$6)
- C_TEXT:C284(SVG_New_arc ;$7)
- C_TEXT:C284(SVG_New_arc ;$8)
- C_REAL:C285(SVG_New_arc ;$9)
-
- //SVG_New_circle
- C_TEXT:C284(SVG_New_circle ;$0)
- C_TEXT:C284(SVG_New_circle ;$1)
- C_REAL:C285(SVG_New_circle ;$2)
- C_REAL:C285(SVG_New_circle ;$3)
- C_REAL:C285(SVG_New_circle ;$4)
- C_TEXT:C284(SVG_New_circle ;$5)
- C_TEXT:C284(SVG_New_circle ;$6)
- C_REAL:C285(SVG_New_circle ;$7)
-
- //SVG_New_ellipse
- C_TEXT:C284(SVG_New_ellipse ;$0)
- C_TEXT:C284(SVG_New_ellipse ;$1)
- C_REAL:C285(SVG_New_ellipse ;$2)
- C_REAL:C285(SVG_New_ellipse ;$3)
- C_REAL:C285(SVG_New_ellipse ;$4)
- C_REAL:C285(SVG_New_ellipse ;$5)
- C_TEXT:C284(SVG_New_ellipse ;$6)
- C_TEXT:C284(SVG_New_ellipse ;$7)
- C_REAL:C285(SVG_New_ellipse ;$8)
-
- //SVG_New_ellipse_bounded
- C_TEXT:C284(SVG_New_ellipse_bounded ;$0)
- C_TEXT:C284(SVG_New_ellipse_bounded ;$1)
- C_REAL:C285(SVG_New_ellipse_bounded ;$2)
- C_REAL:C285(SVG_New_ellipse_bounded ;$3)
- C_REAL:C285(SVG_New_ellipse_bounded ;$4)
- C_REAL:C285(SVG_New_ellipse_bounded ;$5)
- C_TEXT:C284(SVG_New_ellipse_bounded ;$6)
- C_TEXT:C284(SVG_New_ellipse_bounded ;$7)
- C_REAL:C285(SVG_New_ellipse_bounded ;$8)
-
- //SVG_New_embedded_image
- C_TEXT:C284(SVG_New_embedded_image ;$0)
- C_TEXT:C284(SVG_New_embedded_image ;$1)
- C_PICTURE:C286(SVG_New_embedded_image ;$2)
- C_REAL:C285(SVG_New_embedded_image ;$3)
- C_REAL:C285(SVG_New_embedded_image ;$4)
- C_TEXT:C284(SVG_New_embedded_image ;$5)
-
- //SVG_New_image
- C_TEXT:C284(SVG_New_image ;$0)
- C_TEXT:C284(SVG_New_image ;$1)
- C_TEXT:C284(SVG_New_image ;$2)
- C_REAL:C285(SVG_New_image ;$3)
- C_REAL:C285(SVG_New_image ;$4)
- C_REAL:C285(SVG_New_image ;$5)
- C_REAL:C285(SVG_New_image ;$6)
-
- //SVG_New_Line
- C_TEXT:C284(SVG_New_line ;$0)
- C_TEXT:C284(SVG_New_line ;$1)
- C_REAL:C285(SVG_New_line ;$2)
- C_REAL:C285(SVG_New_line ;$3)
- C_REAL:C285(SVG_New_line ;$4)
- C_REAL:C285(SVG_New_line ;$5)
- C_TEXT:C284(SVG_New_line ;$6)
- C_REAL:C285(SVG_New_line ;$7)
-
- //SVG_New_path
- C_TEXT:C284(SVG_New_path ;$0)
- C_TEXT:C284(SVG_New_path ;$1)
- C_REAL:C285(SVG_New_path ;$2)
- C_REAL:C285(SVG_New_path ;$3)
- C_TEXT:C284(SVG_New_path ;$4)
- C_TEXT:C284(SVG_New_path ;$5)
- C_REAL:C285(SVG_New_path ;$6)
-
- //SVG_New_polygon
- C_TEXT:C284(SVG_New_polygon ;$0)
- C_TEXT:C284(SVG_New_polygon ;$1)
- C_TEXT:C284(SVG_New_polygon ;$2)
- C_TEXT:C284(SVG_New_polygon ;$3)
- C_TEXT:C284(SVG_New_polygon ;$4)
- C_REAL:C285(SVG_New_polygon ;$5)
-
- //SVG_New_polygon_by_arrays
- C_TEXT:C284(SVG_New_polygon_by_arrays ;$0)
- C_TEXT:C284(SVG_New_polygon_by_arrays ;$1)
- C_POINTER:C301(SVG_New_polygon_by_arrays ;$2)
- C_POINTER:C301(SVG_New_polygon_by_arrays ;$3)
- C_TEXT:C284(SVG_New_polygon_by_arrays ;$4)
- C_TEXT:C284(SVG_New_polygon_by_arrays ;$5)
- C_REAL:C285(SVG_New_polygon_by_arrays ;$6)
-
- //SVG_New_polyline
- C_TEXT:C284(SVG_New_polyline ;$0)
- C_TEXT:C284(SVG_New_polyline ;$1)
- C_TEXT:C284(SVG_New_polyline ;$2)
- C_TEXT:C284(SVG_New_polyline ;$3)
- C_TEXT:C284(SVG_New_polyline ;$4)
- C_REAL:C285(SVG_New_polyline ;$5)
-
- //SVG_New_polyline_by_arrays
- C_TEXT:C284(SVG_New_polyline_by_arrays ;$0)
- C_TEXT:C284(SVG_New_polyline_by_arrays ;$1)
- C_POINTER:C301(SVG_New_polyline_by_arrays ;$2)
- C_POINTER:C301(SVG_New_polyline_by_arrays ;$3)
- C_TEXT:C284(SVG_New_polyline_by_arrays ;$4)
- C_TEXT:C284(SVG_New_polyline_by_arrays ;$5)
- C_REAL:C285(SVG_New_polyline_by_arrays ;$6)
-
- //SVG_New_rect
- C_TEXT:C284(SVG_New_rect ;$0)
- C_TEXT:C284(SVG_New_rect ;$1)
- C_REAL:C285(SVG_New_rect ;$2)
- C_REAL:C285(SVG_New_rect ;$3)
- C_REAL:C285(SVG_New_rect ;$4)
- C_REAL:C285(SVG_New_rect ;$5)
- C_REAL:C285(SVG_New_rect ;$6)
- C_REAL:C285(SVG_New_rect ;$7)
- C_TEXT:C284(SVG_New_rect ;$8)
- C_TEXT:C284(SVG_New_rect ;$9)
- C_REAL:C285(SVG_New_rect ;$10)
-
- //SVG_New_regular_polygon
- C_TEXT:C284(SVG_New_regular_polygon ;$0)
- C_TEXT:C284(SVG_New_regular_polygon ;$1)
- C_REAL:C285(SVG_New_regular_polygon ;$2)
- C_LONGINT:C283(SVG_New_regular_polygon ;$3)
- C_REAL:C285(SVG_New_regular_polygon ;$4)
- C_REAL:C285(SVG_New_regular_polygon ;$5)
- C_TEXT:C284(SVG_New_regular_polygon ;$6)
- C_TEXT:C284(SVG_New_regular_polygon ;$7)
- C_REAL:C285(SVG_New_regular_polygon ;$8)
-
- //SVG_PATH_ARC
- C_TEXT:C284(SVG_PATH_ARC ;$1)
- C_REAL:C285(SVG_PATH_ARC ;$2)
- C_REAL:C285(SVG_PATH_ARC ;$3)
- C_REAL:C285(SVG_PATH_ARC ;$4)
- C_REAL:C285(SVG_PATH_ARC ;$5)
- C_REAL:C285(SVG_PATH_ARC ;$6)
- C_LONGINT:C283(SVG_PATH_ARC ;$7)
-
- //SVG_PATH_CLOSE
- C_TEXT:C284(SVG_PATH_CLOSE ;$1)
-
- //SVG_PATH_CURVE
- C_TEXT:C284(SVG_PATH_CURVE ;$1)
- C_REAL:C285(SVG_PATH_CURVE ;$2)
- C_REAL:C285(SVG_PATH_CURVE ;$3)
- C_REAL:C285(SVG_PATH_CURVE ;$4)
- C_REAL:C285(SVG_PATH_CURVE ;$5)
- C_REAL:C285(SVG_PATH_CURVE ;$6)
- C_REAL:C285(SVG_PATH_CURVE ;$7)
-
- //SVG_PATH_LINE_TO
- C_TEXT:C284(SVG_PATH_LINE_TO ;$1)
- C_REAL:C285(SVG_PATH_LINE_TO ;$2)
- C_REAL:C285(SVG_PATH_LINE_TO ;$3)
- C_REAL:C285(SVG_PATH_LINE_TO ;${4})
-
- //SVG_PATH_MOVE_TO
- C_TEXT:C284(SVG_PATH_MOVE_TO ;$1)
- C_REAL:C285(SVG_PATH_MOVE_TO ;$2)
- C_REAL:C285(SVG_PATH_MOVE_TO ;$3)
-
- //SVG_PATH_QCURVE
- C_TEXT:C284(SVG_PATH_QCURVE ;$1)
- C_REAL:C285(SVG_PATH_QCURVE ;$2)
- C_REAL:C285(SVG_PATH_QCURVE ;$3)
- C_REAL:C285(SVG_PATH_QCURVE ;$4)
- C_REAL:C285(SVG_PATH_QCURVE ;$5)
-
- //SVG_Use
- C_TEXT:C284(SVG_Use ;$0)
- C_TEXT:C284(SVG_Use ;$1)
- C_TEXT:C284(SVG_Use ;$2)
- C_REAL:C285(SVG_Use ;$3)
- C_REAL:C285(SVG_Use ;$4)
- C_REAL:C285(SVG_Use ;$5)
- C_REAL:C285(SVG_Use ;$6)
-
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ //SVG_Add_object
+ _O_C_TEXT:C284(SVG_Add_object; $0)
+ _O_C_TEXT:C284(SVG_Add_object; $1)
+ _O_C_TEXT:C284(SVG_Add_object; $2)
+
+ //SVG_ADD_POINT
+ _O_C_TEXT:C284(SVG_ADD_POINT; $1)
+ _O_C_REAL:C285(SVG_ADD_POINT; ${2})
+
+ //SVG_New_arc
+ _O_C_TEXT:C284(SVG_New_arc; $0)
+ _O_C_TEXT:C284(SVG_New_arc; $1)
+ _O_C_REAL:C285(SVG_New_arc; $2)
+ _O_C_REAL:C285(SVG_New_arc; $3)
+ _O_C_REAL:C285(SVG_New_arc; $4)
+ _O_C_REAL:C285(SVG_New_arc; $5)
+ _O_C_REAL:C285(SVG_New_arc; $6)
+ _O_C_TEXT:C284(SVG_New_arc; $7)
+ _O_C_TEXT:C284(SVG_New_arc; $8)
+ _O_C_REAL:C285(SVG_New_arc; $9)
+
+ //SVG_New_circle
+ _O_C_TEXT:C284(SVG_New_circle; $0)
+ _O_C_TEXT:C284(SVG_New_circle; $1)
+ _O_C_REAL:C285(SVG_New_circle; $2)
+ _O_C_REAL:C285(SVG_New_circle; $3)
+ _O_C_REAL:C285(SVG_New_circle; $4)
+ _O_C_TEXT:C284(SVG_New_circle; $5)
+ _O_C_TEXT:C284(SVG_New_circle; $6)
+ _O_C_REAL:C285(SVG_New_circle; $7)
+
+ //SVG_New_ellipse
+ _O_C_TEXT:C284(SVG_New_ellipse; $0)
+ _O_C_TEXT:C284(SVG_New_ellipse; $1)
+ _O_C_REAL:C285(SVG_New_ellipse; $2)
+ _O_C_REAL:C285(SVG_New_ellipse; $3)
+ _O_C_REAL:C285(SVG_New_ellipse; $4)
+ _O_C_REAL:C285(SVG_New_ellipse; $5)
+ _O_C_TEXT:C284(SVG_New_ellipse; $6)
+ _O_C_TEXT:C284(SVG_New_ellipse; $7)
+ _O_C_REAL:C285(SVG_New_ellipse; $8)
+
+ //SVG_New_ellipse_bounded
+ _O_C_TEXT:C284(SVG_New_ellipse_bounded; $0)
+ _O_C_TEXT:C284(SVG_New_ellipse_bounded; $1)
+ _O_C_REAL:C285(SVG_New_ellipse_bounded; $2)
+ _O_C_REAL:C285(SVG_New_ellipse_bounded; $3)
+ _O_C_REAL:C285(SVG_New_ellipse_bounded; $4)
+ _O_C_REAL:C285(SVG_New_ellipse_bounded; $5)
+ _O_C_TEXT:C284(SVG_New_ellipse_bounded; $6)
+ _O_C_TEXT:C284(SVG_New_ellipse_bounded; $7)
+ _O_C_REAL:C285(SVG_New_ellipse_bounded; $8)
+
+ //SVG_New_embedded_image
+ _O_C_TEXT:C284(SVG_New_embedded_image; $0)
+ _O_C_TEXT:C284(SVG_New_embedded_image; $1)
+ _O_C_PICTURE:C286(SVG_New_embedded_image; $2)
+ _O_C_REAL:C285(SVG_New_embedded_image; $3)
+ _O_C_REAL:C285(SVG_New_embedded_image; $4)
+ _O_C_TEXT:C284(SVG_New_embedded_image; $5)
+
+ //SVG_New_image
+ _O_C_TEXT:C284(SVG_New_image; $0)
+ _O_C_TEXT:C284(SVG_New_image; $1)
+ _O_C_TEXT:C284(SVG_New_image; $2)
+ _O_C_REAL:C285(SVG_New_image; $3)
+ _O_C_REAL:C285(SVG_New_image; $4)
+ _O_C_REAL:C285(SVG_New_image; $5)
+ _O_C_REAL:C285(SVG_New_image; $6)
+
+ //SVG_New_Line
+ _O_C_TEXT:C284(SVG_New_line; $0)
+ _O_C_TEXT:C284(SVG_New_line; $1)
+ _O_C_REAL:C285(SVG_New_line; $2)
+ _O_C_REAL:C285(SVG_New_line; $3)
+ _O_C_REAL:C285(SVG_New_line; $4)
+ _O_C_REAL:C285(SVG_New_line; $5)
+ _O_C_TEXT:C284(SVG_New_line; $6)
+ _O_C_REAL:C285(SVG_New_line; $7)
+
+ //SVG_New_path
+ _O_C_TEXT:C284(SVG_New_path; $0)
+ _O_C_TEXT:C284(SVG_New_path; $1)
+ _O_C_REAL:C285(SVG_New_path; $2)
+ _O_C_REAL:C285(SVG_New_path; $3)
+ _O_C_TEXT:C284(SVG_New_path; $4)
+ _O_C_TEXT:C284(SVG_New_path; $5)
+ _O_C_REAL:C285(SVG_New_path; $6)
+
+ //SVG_New_polygon
+ _O_C_TEXT:C284(SVG_New_polygon; $0)
+ _O_C_TEXT:C284(SVG_New_polygon; $1)
+ _O_C_TEXT:C284(SVG_New_polygon; $2)
+ _O_C_TEXT:C284(SVG_New_polygon; $3)
+ _O_C_TEXT:C284(SVG_New_polygon; $4)
+ _O_C_REAL:C285(SVG_New_polygon; $5)
+
+ //SVG_New_polygon_by_arrays
+ _O_C_TEXT:C284(SVG_New_polygon_by_arrays; $0)
+ _O_C_TEXT:C284(SVG_New_polygon_by_arrays; $1)
+ _O_C_POINTER:C301(SVG_New_polygon_by_arrays; $2)
+ _O_C_POINTER:C301(SVG_New_polygon_by_arrays; $3)
+ _O_C_TEXT:C284(SVG_New_polygon_by_arrays; $4)
+ _O_C_TEXT:C284(SVG_New_polygon_by_arrays; $5)
+ _O_C_REAL:C285(SVG_New_polygon_by_arrays; $6)
+
+ //SVG_New_polyline
+ _O_C_TEXT:C284(SVG_New_polyline; $0)
+ _O_C_TEXT:C284(SVG_New_polyline; $1)
+ _O_C_TEXT:C284(SVG_New_polyline; $2)
+ _O_C_TEXT:C284(SVG_New_polyline; $3)
+ _O_C_TEXT:C284(SVG_New_polyline; $4)
+ _O_C_REAL:C285(SVG_New_polyline; $5)
+
+ //SVG_New_polyline_by_arrays
+ _O_C_TEXT:C284(SVG_New_polyline_by_arrays; $0)
+ _O_C_TEXT:C284(SVG_New_polyline_by_arrays; $1)
+ _O_C_POINTER:C301(SVG_New_polyline_by_arrays; $2)
+ _O_C_POINTER:C301(SVG_New_polyline_by_arrays; $3)
+ _O_C_TEXT:C284(SVG_New_polyline_by_arrays; $4)
+ _O_C_TEXT:C284(SVG_New_polyline_by_arrays; $5)
+ _O_C_REAL:C285(SVG_New_polyline_by_arrays; $6)
+
+ //SVG_New_rect
+ _O_C_TEXT:C284(SVG_New_rect; $0)
+ _O_C_TEXT:C284(SVG_New_rect; $1)
+ _O_C_REAL:C285(SVG_New_rect; $2)
+ _O_C_REAL:C285(SVG_New_rect; $3)
+ _O_C_REAL:C285(SVG_New_rect; $4)
+ _O_C_REAL:C285(SVG_New_rect; $5)
+ _O_C_REAL:C285(SVG_New_rect; $6)
+ _O_C_REAL:C285(SVG_New_rect; $7)
+ _O_C_TEXT:C284(SVG_New_rect; $8)
+ _O_C_TEXT:C284(SVG_New_rect; $9)
+ _O_C_REAL:C285(SVG_New_rect; $10)
+
+ //SVG_New_regular_polygon
+ _O_C_TEXT:C284(SVG_New_regular_polygon; $0)
+ _O_C_TEXT:C284(SVG_New_regular_polygon; $1)
+ _O_C_REAL:C285(SVG_New_regular_polygon; $2)
+ _O_C_LONGINT:C283(SVG_New_regular_polygon; $3)
+ _O_C_REAL:C285(SVG_New_regular_polygon; $4)
+ _O_C_REAL:C285(SVG_New_regular_polygon; $5)
+ _O_C_TEXT:C284(SVG_New_regular_polygon; $6)
+ _O_C_TEXT:C284(SVG_New_regular_polygon; $7)
+ _O_C_REAL:C285(SVG_New_regular_polygon; $8)
+
+ //SVG_PATH_ARC
+ _O_C_TEXT:C284(SVG_PATH_ARC; $1)
+ _O_C_REAL:C285(SVG_PATH_ARC; $2)
+ _O_C_REAL:C285(SVG_PATH_ARC; $3)
+ _O_C_REAL:C285(SVG_PATH_ARC; $4)
+ _O_C_REAL:C285(SVG_PATH_ARC; $5)
+ _O_C_REAL:C285(SVG_PATH_ARC; $6)
+ _O_C_LONGINT:C283(SVG_PATH_ARC; $7)
+
+ //SVG_PATH_CLOSE
+ _O_C_TEXT:C284(SVG_PATH_CLOSE; $1)
+
+ //SVG_PATH_CURVE
+ _O_C_TEXT:C284(SVG_PATH_CURVE; $1)
+ _O_C_REAL:C285(SVG_PATH_CURVE; $2)
+ _O_C_REAL:C285(SVG_PATH_CURVE; $3)
+ _O_C_REAL:C285(SVG_PATH_CURVE; $4)
+ _O_C_REAL:C285(SVG_PATH_CURVE; $5)
+ _O_C_REAL:C285(SVG_PATH_CURVE; $6)
+ _O_C_REAL:C285(SVG_PATH_CURVE; $7)
+
+ //SVG_PATH_LINE_TO
+ _O_C_TEXT:C284(SVG_PATH_LINE_TO; $1)
+ _O_C_REAL:C285(SVG_PATH_LINE_TO; $2)
+ _O_C_REAL:C285(SVG_PATH_LINE_TO; $3)
+ _O_C_REAL:C285(SVG_PATH_LINE_TO; ${4})
+
+ //SVG_PATH_MOVE_TO
+ _O_C_TEXT:C284(SVG_PATH_MOVE_TO; $1)
+ _O_C_REAL:C285(SVG_PATH_MOVE_TO; $2)
+ _O_C_REAL:C285(SVG_PATH_MOVE_TO; $3)
+
+ //SVG_PATH_QCURVE
+ _O_C_TEXT:C284(SVG_PATH_QCURVE; $1)
+ _O_C_REAL:C285(SVG_PATH_QCURVE; $2)
+ _O_C_REAL:C285(SVG_PATH_QCURVE; $3)
+ _O_C_REAL:C285(SVG_PATH_QCURVE; $4)
+ _O_C_REAL:C285(SVG_PATH_QCURVE; $5)
+
+ //SVG_Use
+ _O_C_TEXT:C284(SVG_Use; $0)
+ _O_C_TEXT:C284(SVG_Use; $1)
+ _O_C_TEXT:C284(SVG_Use; $2)
+ _O_C_REAL:C285(SVG_Use; $3)
+ _O_C_REAL:C285(SVG_Use; $4)
+ _O_C_REAL:C285(SVG_Use; $5)
+ _O_C_REAL:C285(SVG_Use; $6)
+
+ //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
End if
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
- //Text
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//Text
+//:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
If (False:C215)
- //SVG_APPEND_TEXT_TO_TEXTAREA
- C_TEXT:C284(SVG_APPEND_TEXT_TO_TEXTAREA ;$1)
- C_TEXT:C284(SVG_APPEND_TEXT_TO_TEXTAREA ;$2)
-
- //SVG_Get_text
- C_TEXT:C284(SVG_Get_text ;$0)
- C_TEXT:C284(SVG_Get_text ;$1)
-
- //SVG_Get_text
- C_TEXT:C284(SVG_Get_styled_text ;$0)
- C_TEXT:C284(SVG_Get_styled_text ;$1)
- C_BOOLEAN:C305(SVG_Get_styled_text ;$2)
-
- //SVG_New_text
- C_TEXT:C284(SVG_New_text ;$0)
- C_TEXT:C284(SVG_New_text ;$1)
- C_TEXT:C284(SVG_New_text ;$2)
- C_REAL:C285(SVG_New_text ;$3)
- C_REAL:C285(SVG_New_text ;$4)
- C_TEXT:C284(SVG_New_text ;$5)
- C_LONGINT:C283(SVG_New_text ;$6)
- C_LONGINT:C283(SVG_New_text ;$7)
- C_LONGINT:C283(SVG_New_text ;$8)
- C_TEXT:C284(SVG_New_text ;$9)
- C_REAL:C285(SVG_New_text ;$10)
- C_REAL:C285(SVG_New_text ;$11)
- C_REAL:C285(SVG_New_text ;$12)
-
- //SVG_New_textArea
- C_TEXT:C284(SVG_New_textArea ;$0)
- C_TEXT:C284(SVG_New_textArea ;$1)
- C_TEXT:C284(SVG_New_textArea ;$2)
- C_REAL:C285(SVG_New_textArea ;$3)
- C_REAL:C285(SVG_New_textArea ;$4)
- C_REAL:C285(SVG_New_textArea ;$5)
- C_REAL:C285(SVG_New_textArea ;$6)
- C_TEXT:C284(SVG_New_textArea ;$7)
- C_LONGINT:C283(SVG_New_textArea ;$8)
- C_LONGINT:C283(SVG_New_textArea ;$9)
- C_LONGINT:C283(SVG_New_textArea ;$10)
-
- //SVG_New_tspan
- C_TEXT:C284(SVG_New_tspan ;$0)
- C_TEXT:C284(SVG_New_tspan ;$1)
- C_TEXT:C284(SVG_New_tspan ;$2)
- C_REAL:C285(SVG_New_tspan ;$3)
- C_REAL:C285(SVG_New_tspan ;$4)
- C_TEXT:C284(SVG_New_tspan ;$5)
- C_LONGINT:C283(SVG_New_tspan ;$6)
- C_LONGINT:C283(SVG_New_tspan ;$7)
- C_LONGINT:C283(SVG_New_tspan ;$8)
- C_TEXT:C284(SVG_New_tspan ;$9)
-
- //SVG_New_vertical_text
- C_TEXT:C284(SVG_New_vertical_text ;$0)
- C_TEXT:C284(SVG_New_vertical_text ;$1)
- C_TEXT:C284(SVG_New_vertical_text ;$2)
- C_REAL:C285(SVG_New_vertical_text ;$3)
- C_REAL:C285(SVG_New_vertical_text ;$4)
- C_TEXT:C284(SVG_New_vertical_text ;$5)
- C_LONGINT:C283(SVG_New_vertical_text ;$6)
- C_LONGINT:C283(SVG_New_vertical_text ;$7)
- C_LONGINT:C283(SVG_New_vertical_text ;$8)
- C_TEXT:C284(SVG_New_vertical_text ;$9)
- C_REAL:C285(SVG_New_vertical_text ;$10)
-
- //SVG_SET_FONT_COLOR
- C_TEXT:C284(SVG_SET_FONT_COLOR ;$1)
- C_TEXT:C284(SVG_SET_FONT_COLOR ;$2)
- C_TEXT:C284(SVG_SET_FONT_COLOR ;$3)
-
- //SVG_SET_FONT_FAMILY
- C_TEXT:C284(SVG_SET_FONT_FAMILY ;$1)
- C_TEXT:C284(SVG_SET_FONT_FAMILY ;${2})
-
- //SVG_SET_FONT_SIZE
- C_TEXT:C284(SVG_SET_FONT_SIZE ;$1)
- C_LONGINT:C283(SVG_SET_FONT_SIZE ;$2)
-
- //SVG_SET_FONT_STYLE
- C_TEXT:C284(SVG_SET_FONT_STYLE ;$1)
- C_LONGINT:C283(SVG_SET_FONT_STYLE ;$2)
-
- //SVG_SET_TEXT_ANCHOR
- C_TEXT:C284(SVG_SET_TEXT_ANCHOR ;$1)
- C_LONGINT:C283(SVG_SET_TEXT_ANCHOR ;$2)
-
- //SVG_SET_TEXT_LETTER_SPACING
- C_TEXT:C284(SVG_SET_TEXT_LETTER_SPACING ;$1)
- C_REAL:C285(SVG_SET_TEXT_LETTER_SPACING ;$2)
- C_TEXT:C284(SVG_SET_TEXT_LETTER_SPACING ;$3)
-
- //SVG_SET_TEXT_KERNING
- C_TEXT:C284(SVG_SET_TEXT_KERNING ;$1)
- C_REAL:C285(SVG_SET_TEXT_KERNING ;$2)
- C_TEXT:C284(SVG_SET_TEXT_KERNING ;$3)
-
- //SVG_SET_TEXT_RENDERING
- C_TEXT:C284(SVG_SET_TEXT_RENDERING ;$1)
- C_TEXT:C284(SVG_SET_TEXT_RENDERING ;$2)
-
- //SVG_SET_TEXTAREA_TEXT
- C_TEXT:C284(SVG_SET_TEXTAREA_TEXT ;$1)
- C_TEXT:C284(SVG_SET_TEXTAREA_TEXT ;$2)
-
- //SVG_SET_TEXT_WRITING_MODE
- C_TEXT:C284(SVG_SET_TEXT_WRITING_MODE ;$1)
- C_TEXT:C284(SVG_SET_TEXT_WRITING_MODE ;$2)
-
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ //SVG_APPEND_TEXT_TO_TEXTAREA
+ _O_C_TEXT:C284(SVG_APPEND_TEXT_TO_TEXTAREA; $1)
+ _O_C_TEXT:C284(SVG_APPEND_TEXT_TO_TEXTAREA; $2)
+
+ //SVG_Get_text
+ _O_C_TEXT:C284(SVG_Get_text; $0)
+ _O_C_TEXT:C284(SVG_Get_text; $1)
+
+ //SVG_Get_text
+ _O_C_TEXT:C284(SVG_Get_styled_text; $0)
+ _O_C_TEXT:C284(SVG_Get_styled_text; $1)
+ _O_C_BOOLEAN:C305(SVG_Get_styled_text; $2)
+
+ //SVG_New_text
+ _O_C_TEXT:C284(SVG_New_text; $0)
+ _O_C_TEXT:C284(SVG_New_text; $1)
+ _O_C_TEXT:C284(SVG_New_text; $2)
+ _O_C_REAL:C285(SVG_New_text; $3)
+ _O_C_REAL:C285(SVG_New_text; $4)
+ _O_C_TEXT:C284(SVG_New_text; $5)
+ _O_C_LONGINT:C283(SVG_New_text; $6)
+ _O_C_LONGINT:C283(SVG_New_text; $7)
+ _O_C_LONGINT:C283(SVG_New_text; $8)
+ _O_C_TEXT:C284(SVG_New_text; $9)
+ _O_C_REAL:C285(SVG_New_text; $10)
+ _O_C_REAL:C285(SVG_New_text; $11)
+ _O_C_REAL:C285(SVG_New_text; $12)
+
+ //SVG_New_textArea
+ _O_C_TEXT:C284(SVG_New_textArea; $0)
+ _O_C_TEXT:C284(SVG_New_textArea; $1)
+ _O_C_TEXT:C284(SVG_New_textArea; $2)
+ _O_C_REAL:C285(SVG_New_textArea; $3)
+ _O_C_REAL:C285(SVG_New_textArea; $4)
+ _O_C_REAL:C285(SVG_New_textArea; $5)
+ _O_C_REAL:C285(SVG_New_textArea; $6)
+ _O_C_TEXT:C284(SVG_New_textArea; $7)
+ _O_C_LONGINT:C283(SVG_New_textArea; $8)
+ _O_C_LONGINT:C283(SVG_New_textArea; $9)
+ _O_C_LONGINT:C283(SVG_New_textArea; $10)
+
+ //SVG_New_tspan
+ _O_C_TEXT:C284(SVG_New_tspan; $0)
+ _O_C_TEXT:C284(SVG_New_tspan; $1)
+ _O_C_TEXT:C284(SVG_New_tspan; $2)
+ _O_C_REAL:C285(SVG_New_tspan; $3)
+ _O_C_REAL:C285(SVG_New_tspan; $4)
+ _O_C_TEXT:C284(SVG_New_tspan; $5)
+ _O_C_LONGINT:C283(SVG_New_tspan; $6)
+ _O_C_LONGINT:C283(SVG_New_tspan; $7)
+ _O_C_LONGINT:C283(SVG_New_tspan; $8)
+ _O_C_TEXT:C284(SVG_New_tspan; $9)
+
+ //SVG_New_vertical_text
+ _O_C_TEXT:C284(SVG_New_vertical_text; $0)
+ _O_C_TEXT:C284(SVG_New_vertical_text; $1)
+ _O_C_TEXT:C284(SVG_New_vertical_text; $2)
+ _O_C_REAL:C285(SVG_New_vertical_text; $3)
+ _O_C_REAL:C285(SVG_New_vertical_text; $4)
+ _O_C_TEXT:C284(SVG_New_vertical_text; $5)
+ _O_C_LONGINT:C283(SVG_New_vertical_text; $6)
+ _O_C_LONGINT:C283(SVG_New_vertical_text; $7)
+ _O_C_LONGINT:C283(SVG_New_vertical_text; $8)
+ _O_C_TEXT:C284(SVG_New_vertical_text; $9)
+ _O_C_REAL:C285(SVG_New_vertical_text; $10)
+
+ //SVG_SET_FONT_COLOR
+ _O_C_TEXT:C284(SVG_SET_FONT_COLOR; $1)
+ _O_C_TEXT:C284(SVG_SET_FONT_COLOR; $2)
+ _O_C_TEXT:C284(SVG_SET_FONT_COLOR; $3)
+
+ //SVG_SET_FONT_FAMILY
+ _O_C_TEXT:C284(SVG_SET_FONT_FAMILY; $1)
+ _O_C_TEXT:C284(SVG_SET_FONT_FAMILY; ${2})
+
+ //SVG_SET_FONT_SIZE
+ _O_C_TEXT:C284(SVG_SET_FONT_SIZE; $1)
+ _O_C_LONGINT:C283(SVG_SET_FONT_SIZE; $2)
+
+ //SVG_SET_FONT_STYLE
+ _O_C_TEXT:C284(SVG_SET_FONT_STYLE; $1)
+ _O_C_LONGINT:C283(SVG_SET_FONT_STYLE; $2)
+
+ //SVG_SET_TEXT_ANCHOR
+ _O_C_TEXT:C284(SVG_SET_TEXT_ANCHOR; $1)
+ _O_C_LONGINT:C283(SVG_SET_TEXT_ANCHOR; $2)
+
+ //SVG_SET_TEXT_LETTER_SPACING
+ _O_C_TEXT:C284(SVG_SET_TEXT_LETTER_SPACING; $1)
+ _O_C_REAL:C285(SVG_SET_TEXT_LETTER_SPACING; $2)
+ _O_C_TEXT:C284(SVG_SET_TEXT_LETTER_SPACING; $3)
+
+ //SVG_SET_TEXT_KERNING
+ _O_C_TEXT:C284(SVG_SET_TEXT_KERNING; $1)
+ _O_C_REAL:C285(SVG_SET_TEXT_KERNING; $2)
+ _O_C_TEXT:C284(SVG_SET_TEXT_KERNING; $3)
+
+ //SVG_SET_TEXT_RENDERING
+ _O_C_TEXT:C284(SVG_SET_TEXT_RENDERING; $1)
+ _O_C_TEXT:C284(SVG_SET_TEXT_RENDERING; $2)
+
+ //SVG_SET_TEXTAREA_TEXT
+ _O_C_TEXT:C284(SVG_SET_TEXTAREA_TEXT; $1)
+ _O_C_TEXT:C284(SVG_SET_TEXTAREA_TEXT; $2)
+
+ //SVG_SET_TEXT_WRITING_MODE
+ _O_C_TEXT:C284(SVG_SET_TEXT_WRITING_MODE; $1)
+ _O_C_TEXT:C284(SVG_SET_TEXT_WRITING_MODE; $2)
+
+ //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
End if
If (False:C215) //ATTRIBUTES
If (False:C215) //GETTER
- //SVG_GET_ATTRIBUTES
- C_TEXT:C284(SVG_GET_ATTRIBUTES ;$1)
- C_POINTER:C301(SVG_GET_ATTRIBUTES ;$2)
- C_POINTER:C301(SVG_GET_ATTRIBUTES ;$3)
+ //SVG_GET_ATTRIBUTES
+ _O_C_TEXT:C284(SVG_GET_ATTRIBUTES; $1)
+ _O_C_POINTER:C301(SVG_GET_ATTRIBUTES; $2)
+ _O_C_POINTER:C301(SVG_GET_ATTRIBUTES; $3)
- //SVG_Get_class
- C_TEXT:C284(SVG_Get_class ;$0)
- C_TEXT:C284(SVG_Get_class ;$1)
- C_POINTER:C301(SVG_Get_class ;$2)
+ //SVG_Get_class
+ _O_C_TEXT:C284(SVG_Get_class; $0)
+ _O_C_TEXT:C284(SVG_Get_class; $1)
+ _O_C_POINTER:C301(SVG_Get_class; $2)
- //SVG_Get_fill_brush
- C_TEXT:C284(SVG_Get_fill_brush ;$0)
- C_TEXT:C284(SVG_Get_fill_brush ;$1)
+ //SVG_Get_fill_brush
+ _O_C_TEXT:C284(SVG_Get_fill_brush; $0)
+ _O_C_TEXT:C284(SVG_Get_fill_brush; $1)
- //SVG_Get_ID
- C_TEXT:C284(SVG_Get_ID ;$0)
- C_TEXT:C284(SVG_Get_ID ;$1)
+ //SVG_Get_ID
+ _O_C_TEXT:C284(SVG_Get_ID; $0)
+ _O_C_TEXT:C284(SVG_Get_ID; $1)
End if
If (False:C215) //SETTER
- //SVG_SET_STROKE_DASHARRAY
- C_TEXT:C284(SVG_SET_STROKE_DASHARRAY ;$1)
- C_REAL:C285(SVG_SET_STROKE_DASHARRAY ;$2)
- C_LONGINT:C283(SVG_SET_STROKE_DASHARRAY ;${3})
-
- //SVG_SET_CLASS
- C_TEXT:C284(SVG_SET_CLASS ;$1)
- C_TEXT:C284(SVG_SET_CLASS ;$2)
-
- //SVG_SET_CLIP_PATH
- C_TEXT:C284(SVG_SET_CLIP_PATH ;$1)
- C_TEXT:C284(SVG_SET_CLIP_PATH ;$2)
-
- //SVG_SET_ATTRIBUT
- C_TEXT:C284(SVG_SET_ATTRIBUTES ;$1)
- C_TEXT:C284(SVG_SET_ATTRIBUTES ;${2})
-
- //SVG_SET_ATTRIBUTES_BY_ARRAYS
- C_TEXT:C284(SVG_SET_ATTRIBUTES_BY_ARRAYS ;$1)
- C_POINTER:C301(SVG_SET_ATTRIBUTES_BY_ARRAYS ;$2)
- C_POINTER:C301(SVG_SET_ATTRIBUTES_BY_ARRAYS ;$3)
-
- //SVG_SET_DIMENSIONS
- C_TEXT:C284(SVG_SET_DIMENSIONS ;$1)
- C_REAL:C285(SVG_SET_DIMENSIONS ;$2)
- C_REAL:C285(SVG_SET_DIMENSIONS ;$3)
- C_TEXT:C284(SVG_SET_DIMENSIONS ;$4)
-
- //SVG_SET_FILL_BRUSH
- C_TEXT:C284(SVG_SET_FILL_BRUSH ;$1)
- C_TEXT:C284(SVG_SET_FILL_BRUSH ;$2)
- C_LONGINT:C283(SVG_SET_FILL_BRUSH ;$3)
-
- //SVG_SET_FILL_RULE
- C_TEXT:C284(SVG_SET_FILL_RULE ;$1)
- C_TEXT:C284(SVG_SET_FILL_RULE ;$2)
-
- //SVG_SET_FILTER
- C_TEXT:C284(SVG_SET_FILTER ;$1)
- C_TEXT:C284(SVG_SET_FILTER ;$2)
-
- //SVG_SET_ID
- C_TEXT:C284(SVG_SET_ID ;$1)
- C_TEXT:C284(SVG_SET_ID ;$2)
-
- //SVG_SET_MARKER
- C_TEXT:C284(SVG_SET_MARKER ;$1)
- C_TEXT:C284(SVG_SET_MARKER ;$2)
- C_TEXT:C284(SVG_SET_MARKER ;$3)
-
- //SVG_SET_OPACITY
- C_TEXT:C284(SVG_SET_OPACITY ;$1)
- C_LONGINT:C283(SVG_SET_OPACITY ;$2)
- C_LONGINT:C283(SVG_SET_OPACITY ;$3)
-
- //SVG_SET_ROUNDING_RECT
- C_TEXT:C284(SVG_SET_ROUNDING_RECT ;$1)
- C_REAL:C285(SVG_SET_ROUNDING_RECT ;$2)
- C_REAL:C285(SVG_SET_ROUNDING_RECT ;$3)
-
- //SVG_SET_SHAPE_RENDERING
- C_TEXT:C284(SVG_SET_SHAPE_RENDERING ;$1)
- C_TEXT:C284(SVG_SET_SHAPE_RENDERING ;$2)
-
- //SVG_SET_STROKE_BRUSH
- C_TEXT:C284(SVG_SET_STROKE_BRUSH ;$1)
- C_TEXT:C284(SVG_SET_STROKE_BRUSH ;$2)
- C_LONGINT:C283(SVG_SET_STROKE_BRUSH ;$3)
-
- //SVG_SET_STROKE_LINECAP
- C_TEXT:C284(SVG_SET_STROKE_LINECAP ;$1)
- C_TEXT:C284(SVG_SET_STROKE_LINECAP ;$2)
-
- //SVG_SET_STROKE_LINEJOIN
- C_TEXT:C284(SVG_SET_STROKE_LINEJOIN ;$1)
- C_TEXT:C284(SVG_SET_STROKE_LINEJOIN ;$2)
-
- //SVG_SET_STROKE_MITERLIMIT
- C_TEXT:C284(SVG_SET_STROKE_MITERLIMIT ;$1)
- C_LONGINT:C283(SVG_SET_STROKE_MITERLIMIT ;$2)
-
- //SVG_SET_STROKE_VECTOR_EFFECT
- C_TEXT:C284(SVG_SET_STROKE_VECTOR_EFFECT ;$1)
- C_TEXT:C284(SVG_SET_STROKE_VECTOR_EFFECT ;$2)
-
- //SVG_SET_STROKE_WIDTH
- C_TEXT:C284(SVG_SET_STROKE_WIDTH ;$1)
- C_REAL:C285(SVG_SET_STROKE_WIDTH ;$2)
- C_TEXT:C284(SVG_SET_STROKE_WIDTH ;$3)
-
- //SVG_SET_TRANSFORM_MATRIX
- C_TEXT:C284(SVG_SET_TRANSFORM_MATRIX ;$1)
- C_REAL:C285(SVG_SET_TRANSFORM_MATRIX ;$2)
- C_REAL:C285(SVG_SET_TRANSFORM_MATRIX ;$3)
- C_REAL:C285(SVG_SET_TRANSFORM_MATRIX ;$4)
- C_REAL:C285(SVG_SET_TRANSFORM_MATRIX ;$5)
- C_REAL:C285(SVG_SET_TRANSFORM_MATRIX ;$6)
- C_REAL:C285(SVG_SET_TRANSFORM_MATRIX ;$7)
-
- //SVG_SET_TRANSFORM_ROTATE
- C_TEXT:C284(SVG_SET_TRANSFORM_ROTATE ;$1)
- C_REAL:C285(SVG_SET_TRANSFORM_ROTATE ;$2)
- C_REAL:C285(SVG_SET_TRANSFORM_ROTATE ;$3)
- C_REAL:C285(SVG_SET_TRANSFORM_ROTATE ;$4)
-
- //SVG_SET_TRANSFORM_SCALE
- C_TEXT:C284(SVG_SET_TRANSFORM_SCALE ;$1)
- C_REAL:C285(SVG_SET_TRANSFORM_SCALE ;$2)
- C_REAL:C285(SVG_SET_TRANSFORM_SCALE ;$3)
-
- //SVG_SET_TRANSFORM_SKEW
- C_TEXT:C284(SVG_SET_TRANSFORM_SKEW ;$1)
- C_REAL:C285(SVG_SET_TRANSFORM_SKEW ;$2)
- C_REAL:C285(SVG_SET_TRANSFORM_SKEW ;$3)
-
- //SVG_SET_TRANSFORM_TRANSLATE
- C_TEXT:C284(SVG_SET_TRANSFORM_TRANSLATE ;$1)
- C_REAL:C285(SVG_SET_TRANSFORM_TRANSLATE ;$2)
- C_REAL:C285(SVG_SET_TRANSFORM_TRANSLATE ;$3)
-
- //SVG_SET_VIEWBOX
- C_TEXT:C284(SVG_SET_VIEWBOX ;$1)
- C_REAL:C285(SVG_SET_VIEWBOX ;$2)
- C_REAL:C285(SVG_SET_VIEWBOX ;$3)
- C_REAL:C285(SVG_SET_VIEWBOX ;$4)
- C_REAL:C285(SVG_SET_VIEWBOX ;$5)
- C_TEXT:C284(SVG_SET_VIEWBOX ;$6)
-
- //SVG_SET_VIEWPORT_FILL
- C_TEXT:C284(SVG_SET_VIEWPORT_FILL ;$1)
- C_TEXT:C284(SVG_SET_VIEWPORT_FILL ;$2)
- C_LONGINT:C283(SVG_SET_VIEWPORT_FILL ;$3)
-
- //SVG_SET_VISIBILITY
- C_TEXT:C284(SVG_SET_VISIBILITY ;$1)
- C_BOOLEAN:C305(SVG_SET_VISIBILITY ;$2)
-
- //SVG_SET_XY
- C_TEXT:C284(SVG_SET_XY ;$1)
- C_REAL:C285(SVG_SET_XY ;$2)
- C_REAL:C285(SVG_SET_XY ;$3)
+ //SVG_SET_STROKE_DASHARRAY
+ _O_C_TEXT:C284(SVG_SET_STROKE_DASHARRAY; $1)
+ _O_C_REAL:C285(SVG_SET_STROKE_DASHARRAY; $2)
+ _O_C_LONGINT:C283(SVG_SET_STROKE_DASHARRAY; ${3})
+
+ //SVG_SET_CLASS
+ _O_C_TEXT:C284(SVG_SET_CLASS; $1)
+ _O_C_TEXT:C284(SVG_SET_CLASS; $2)
+
+ //SVG_SET_CLIP_PATH
+ _O_C_TEXT:C284(SVG_SET_CLIP_PATH; $1)
+ _O_C_TEXT:C284(SVG_SET_CLIP_PATH; $2)
+
+ //SVG_SET_ATTRIBUT
+ _O_C_TEXT:C284(SVG_SET_ATTRIBUTES; $1)
+ _O_C_TEXT:C284(SVG_SET_ATTRIBUTES; ${2})
+
+ //SVG_SET_ATTRIBUTES_BY_ARRAYS
+ _O_C_TEXT:C284(SVG_SET_ATTRIBUTES_BY_ARRAYS; $1)
+ _O_C_POINTER:C301(SVG_SET_ATTRIBUTES_BY_ARRAYS; $2)
+ _O_C_POINTER:C301(SVG_SET_ATTRIBUTES_BY_ARRAYS; $3)
+
+ //SVG_SET_DIMENSIONS
+ _O_C_TEXT:C284(SVG_SET_DIMENSIONS; $1)
+ _O_C_REAL:C285(SVG_SET_DIMENSIONS; $2)
+ _O_C_REAL:C285(SVG_SET_DIMENSIONS; $3)
+ _O_C_TEXT:C284(SVG_SET_DIMENSIONS; $4)
+
+ //SVG_SET_FILL_BRUSH
+ _O_C_TEXT:C284(SVG_SET_FILL_BRUSH; $1)
+ _O_C_TEXT:C284(SVG_SET_FILL_BRUSH; $2)
+ _O_C_LONGINT:C283(SVG_SET_FILL_BRUSH; $3)
+
+ //SVG_SET_FILL_RULE
+ _O_C_TEXT:C284(SVG_SET_FILL_RULE; $1)
+ _O_C_TEXT:C284(SVG_SET_FILL_RULE; $2)
+
+ //SVG_SET_FILTER
+ _O_C_TEXT:C284(SVG_SET_FILTER; $1)
+ _O_C_TEXT:C284(SVG_SET_FILTER; $2)
+
+ //SVG_SET_ID
+ _O_C_TEXT:C284(SVG_SET_ID; $1)
+ _O_C_TEXT:C284(SVG_SET_ID; $2)
+
+ //SVG_SET_MARKER
+ _O_C_TEXT:C284(SVG_SET_MARKER; $1)
+ _O_C_TEXT:C284(SVG_SET_MARKER; $2)
+ _O_C_TEXT:C284(SVG_SET_MARKER; $3)
+
+ //SVG_SET_OPACITY
+ _O_C_TEXT:C284(SVG_SET_OPACITY; $1)
+ _O_C_LONGINT:C283(SVG_SET_OPACITY; $2)
+ _O_C_LONGINT:C283(SVG_SET_OPACITY; $3)
+
+ //SVG_SET_ROUNDING_RECT
+ _O_C_TEXT:C284(SVG_SET_ROUNDING_RECT; $1)
+ _O_C_REAL:C285(SVG_SET_ROUNDING_RECT; $2)
+ _O_C_REAL:C285(SVG_SET_ROUNDING_RECT; $3)
+
+ //SVG_SET_SHAPE_RENDERING
+ _O_C_TEXT:C284(SVG_SET_SHAPE_RENDERING; $1)
+ _O_C_TEXT:C284(SVG_SET_SHAPE_RENDERING; $2)
+
+ //SVG_SET_STROKE_BRUSH
+ _O_C_TEXT:C284(SVG_SET_STROKE_BRUSH; $1)
+ _O_C_TEXT:C284(SVG_SET_STROKE_BRUSH; $2)
+ _O_C_LONGINT:C283(SVG_SET_STROKE_BRUSH; $3)
+
+ //SVG_SET_STROKE_LINECAP
+ _O_C_TEXT:C284(SVG_SET_STROKE_LINECAP; $1)
+ _O_C_TEXT:C284(SVG_SET_STROKE_LINECAP; $2)
+
+ //SVG_SET_STROKE_LINEJOIN
+ _O_C_TEXT:C284(SVG_SET_STROKE_LINEJOIN; $1)
+ _O_C_TEXT:C284(SVG_SET_STROKE_LINEJOIN; $2)
+
+ //SVG_SET_STROKE_MITERLIMIT
+ _O_C_TEXT:C284(SVG_SET_STROKE_MITERLIMIT; $1)
+ _O_C_LONGINT:C283(SVG_SET_STROKE_MITERLIMIT; $2)
+
+ //SVG_SET_STROKE_VECTOR_EFFECT
+ _O_C_TEXT:C284(SVG_SET_STROKE_VECTOR_EFFECT; $1)
+ _O_C_TEXT:C284(SVG_SET_STROKE_VECTOR_EFFECT; $2)
+
+ //SVG_SET_STROKE_WIDTH
+ _O_C_TEXT:C284(SVG_SET_STROKE_WIDTH; $1)
+ _O_C_REAL:C285(SVG_SET_STROKE_WIDTH; $2)
+ _O_C_TEXT:C284(SVG_SET_STROKE_WIDTH; $3)
+
+ //SVG_SET_TRANSFORM_MATRIX
+ _O_C_TEXT:C284(SVG_SET_TRANSFORM_MATRIX; $1)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_MATRIX; $2)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_MATRIX; $3)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_MATRIX; $4)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_MATRIX; $5)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_MATRIX; $6)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_MATRIX; $7)
+
+ //SVG_SET_TRANSFORM_ROTATE
+ _O_C_TEXT:C284(SVG_SET_TRANSFORM_ROTATE; $1)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_ROTATE; $2)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_ROTATE; $3)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_ROTATE; $4)
+
+ //SVG_SET_TRANSFORM_SCALE
+ _O_C_TEXT:C284(SVG_SET_TRANSFORM_SCALE; $1)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_SCALE; $2)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_SCALE; $3)
+
+ //SVG_SET_TRANSFORM_SKEW
+ _O_C_TEXT:C284(SVG_SET_TRANSFORM_SKEW; $1)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_SKEW; $2)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_SKEW; $3)
+
+ //SVG_SET_TRANSFORM_TRANSLATE
+ _O_C_TEXT:C284(SVG_SET_TRANSFORM_TRANSLATE; $1)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_TRANSLATE; $2)
+ _O_C_REAL:C285(SVG_SET_TRANSFORM_TRANSLATE; $3)
+
+ //SVG_SET_VIEWBOX
+ _O_C_TEXT:C284(SVG_SET_VIEWBOX; $1)
+ _O_C_REAL:C285(SVG_SET_VIEWBOX; $2)
+ _O_C_REAL:C285(SVG_SET_VIEWBOX; $3)
+ _O_C_REAL:C285(SVG_SET_VIEWBOX; $4)
+ _O_C_REAL:C285(SVG_SET_VIEWBOX; $5)
+ _O_C_TEXT:C284(SVG_SET_VIEWBOX; $6)
+
+ //SVG_SET_VIEWPORT_FILL
+ _O_C_TEXT:C284(SVG_SET_VIEWPORT_FILL; $1)
+ _O_C_TEXT:C284(SVG_SET_VIEWPORT_FILL; $2)
+ _O_C_LONGINT:C283(SVG_SET_VIEWPORT_FILL; $3)
+
+ //SVG_SET_VISIBILITY
+ _O_C_TEXT:C284(SVG_SET_VISIBILITY; $1)
+ _O_C_BOOLEAN:C305(SVG_SET_VISIBILITY; $2)
+
+ //SVG_SET_XY
+ _O_C_TEXT:C284(SVG_SET_XY; $1)
+ _O_C_REAL:C285(SVG_SET_XY; $2)
+ _O_C_REAL:C285(SVG_SET_XY; $3)
End if
End if
If (False:C215) //COLOR & GRADIENTS
- //SVG_Color_from_index
- C_TEXT:C284(SVG_Color_from_index ;$0)
- C_LONGINT:C283(SVG_Color_from_index ;$1)
-
- //SVG_Color_grey
- C_TEXT:C284(SVG_Color_grey ;$0)
- C_LONGINT:C283(SVG_Color_grey ;$1)
-
- //SVG_Color_RGB_from_CMYK
- C_TEXT:C284(SVG_Color_RGB_from_CMYK ;$0)
- C_LONGINT:C283(SVG_Color_RGB_from_CMYK ;$1)
- C_LONGINT:C283(SVG_Color_RGB_from_CMYK ;$2)
- C_LONGINT:C283(SVG_Color_RGB_from_CMYK ;$3)
- C_LONGINT:C283(SVG_Color_RGB_from_CMYK ;$4)
- C_LONGINT:C283(SVG_Color_RGB_from_CMYK ;$5)
-
- //SVG_Color_RGB_from_HLS
- C_TEXT:C284(SVG_Color_RGB_from_HLS ;$0)
- C_LONGINT:C283(SVG_Color_RGB_from_HLS ;$1)
- C_LONGINT:C283(SVG_Color_RGB_from_HLS ;$2)
- C_LONGINT:C283(SVG_Color_RGB_from_HLS ;$3)
- C_LONGINT:C283(SVG_Color_RGB_from_HLS ;$4)
-
- //SVG_Color_RGB_from_long
- C_TEXT:C284(SVG_Color_RGB_from_long ;$0)
- C_LONGINT:C283(SVG_Color_RGB_from_long ;$1)
- C_LONGINT:C283(SVG_Color_RGB_from_long ;$2)
-
- //SVG_FADE_TO_GREY_SCALE
- C_TEXT:C284(SVG_FADE_TO_GREY_SCALE ;$1)
- C_REAL:C285(SVG_FADE_TO_GREY_SCALE ;$2)
-
- //SVG_GET_COLORS_ARRAY
- C_POINTER:C301(SVG_GET_COLORS_ARRAY ;$1)
-
- //SVG_GET_DEFAULT_BRUSHES
- C_POINTER:C301(SVG_GET_DEFAULT_BRUSHES ;$1)
- C_POINTER:C301(SVG_GET_DEFAULT_BRUSHES ;$2)
-
- //SVG_Get_named_color_value
- C_LONGINT:C283(SVG_Get_named_color_value ;$0)
- C_TEXT:C284(SVG_Get_named_color_value ;$1)
- C_TEXT:C284(SVG_Get_named_color_value ;$2)
-
- //SVG_SET_BRIGHTNESS
- C_TEXT:C284(SVG_SET_BRIGHTNESS ;$1)
- C_REAL:C285(SVG_SET_BRIGHTNESS ;${2})
-
- //SVG_SET_DEFAULT_BRUSHES
- C_TEXT:C284(SVG_SET_DEFAULT_BRUSHES ;$1)
- C_TEXT:C284(SVG_SET_DEFAULT_BRUSHES ;$2)
-
- //SVG_SET_HUE
- C_TEXT:C284(SVG_SET_HUE ;$1)
- C_LONGINT:C283(SVG_SET_HUE ;$2)
-
- //SVG_SET_SATURATION
- C_TEXT:C284(SVG_SET_SATURATION ;$1)
- C_LONGINT:C283(SVG_SET_SATURATION ;$2)
+ //SVG_Color_from_index
+ _O_C_TEXT:C284(SVG_Color_from_index; $0)
+ _O_C_LONGINT:C283(SVG_Color_from_index; $1)
+
+ //SVG_Color_grey
+ _O_C_TEXT:C284(SVG_Color_grey; $0)
+ _O_C_LONGINT:C283(SVG_Color_grey; $1)
+
+ //SVG_Color_RGB_from_CMYK
+ _O_C_TEXT:C284(SVG_Color_RGB_from_CMYK; $0)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_CMYK; $1)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_CMYK; $2)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_CMYK; $3)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_CMYK; $4)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_CMYK; $5)
+
+ //SVG_Color_RGB_from_HLS
+ _O_C_TEXT:C284(SVG_Color_RGB_from_HLS; $0)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_HLS; $1)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_HLS; $2)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_HLS; $3)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_HLS; $4)
+
+ //SVG_Color_RGB_from_long
+ _O_C_TEXT:C284(SVG_Color_RGB_from_long; $0)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_long; $1)
+ _O_C_LONGINT:C283(SVG_Color_RGB_from_long; $2)
+
+ //SVG_FADE_TO_GREY_SCALE
+ _O_C_TEXT:C284(SVG_FADE_TO_GREY_SCALE; $1)
+ _O_C_REAL:C285(SVG_FADE_TO_GREY_SCALE; $2)
+
+ //SVG_GET_COLORS_ARRAY
+ _O_C_POINTER:C301(SVG_GET_COLORS_ARRAY; $1)
+
+ //SVG_GET_DEFAULT_BRUSHES
+ _O_C_POINTER:C301(SVG_GET_DEFAULT_BRUSHES; $1)
+ _O_C_POINTER:C301(SVG_GET_DEFAULT_BRUSHES; $2)
+
+ //SVG_Get_named_color_value
+ _O_C_LONGINT:C283(SVG_Get_named_color_value; $0)
+ _O_C_TEXT:C284(SVG_Get_named_color_value; $1)
+ _O_C_TEXT:C284(SVG_Get_named_color_value; $2)
+
+ //SVG_SET_BRIGHTNESS
+ _O_C_TEXT:C284(SVG_SET_BRIGHTNESS; $1)
+ _O_C_REAL:C285(SVG_SET_BRIGHTNESS; ${2})
+
+ //SVG_SET_DEFAULT_BRUSHES
+ _O_C_TEXT:C284(SVG_SET_DEFAULT_BRUSHES; $1)
+ _O_C_TEXT:C284(SVG_SET_DEFAULT_BRUSHES; $2)
+
+ //SVG_SET_HUE
+ _O_C_TEXT:C284(SVG_SET_HUE; $1)
+ _O_C_LONGINT:C283(SVG_SET_HUE; $2)
+
+ //SVG_SET_SATURATION
+ _O_C_TEXT:C284(SVG_SET_SATURATION; $1)
+ _O_C_LONGINT:C283(SVG_SET_SATURATION; $2)
End if
If (False:C215) //FILTER
- //SVG_Filter_Blend
- C_TEXT:C284(SVG_Filter_Blend ;$0)
- C_TEXT:C284(SVG_Filter_Blend ;$1)
- C_TEXT:C284(SVG_Filter_Blend ;$2)
- C_TEXT:C284(SVG_Filter_Blend ;$3)
- C_TEXT:C284(SVG_Filter_Blend ;$4)
- C_TEXT:C284(SVG_Filter_Blend ;$5)
-
- //• SVG_Filter_Blur
- C_TEXT:C284(SVG_Filter_Blur ;$0)
- C_TEXT:C284(SVG_Filter_Blur ;$1)
- C_LONGINT:C283(SVG_Filter_Blur ;$2)
- C_TEXT:C284(SVG_Filter_Blur ;$3)
- C_TEXT:C284(SVG_Filter_Blur ;$4)
-
- //SVG_Filter_ColorMatrix
- C_TEXT:C284(SVG_Filter_ColorMatrix ;$0)
- C_TEXT:C284(SVG_Filter_ColorMatrix ;$1)
- C_TEXT:C284(SVG_Filter_ColorMatrix ;$2)
- C_TEXT:C284(SVG_Filter_ColorMatrix ;$3)
- C_TEXT:C284(SVG_Filter_ColorMatrix ;$4)
- C_TEXT:C284(SVG_Filter_ColorMatrix ;$5)
-
- //SVG_Filter_Composite
- C_TEXT:C284(SVG_Filter_Composite ;$0)
- C_TEXT:C284(SVG_Filter_Composite ;$1)
- C_TEXT:C284(SVG_Filter_Composite ;$2)
- C_TEXT:C284(SVG_Filter_Composite ;$3)
- C_TEXT:C284(SVG_Filter_Composite ;$4)
- C_TEXT:C284(SVG_Filter_Composite ;$5)
-
- //SVG_Filter_Merge
- C_TEXT:C284(SVG_Filter_Merge ;$0)
- C_TEXT:C284(SVG_Filter_Merge ;$1)
- C_TEXT:C284(SVG_Filter_Merge ;${2})
-
- //SVG_Filter_MergeNode
- C_TEXT:C284(SVG_Filter_MergeNode ;$0)
- C_TEXT:C284(SVG_Filter_MergeNode ;$1)
- C_TEXT:C284(SVG_Filter_MergeNode ;$2)
-
- //• SVG_Filter_Offset
- C_TEXT:C284(SVG_Filter_Offset ;$0)
- C_TEXT:C284(SVG_Filter_Offset ;$1)
- C_LONGINT:C283(SVG_Filter_Offset ;$2)
- C_LONGINT:C283(SVG_Filter_Offset ;$3)
- C_TEXT:C284(SVG_Filter_Offset ;$4)
- C_TEXT:C284(SVG_Filter_Offset ;$5)
-
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ //SVG_Filter_Blend
+ _O_C_TEXT:C284(SVG_Filter_Blend; $0)
+ _O_C_TEXT:C284(SVG_Filter_Blend; $1)
+ _O_C_TEXT:C284(SVG_Filter_Blend; $2)
+ _O_C_TEXT:C284(SVG_Filter_Blend; $3)
+ _O_C_TEXT:C284(SVG_Filter_Blend; $4)
+ _O_C_TEXT:C284(SVG_Filter_Blend; $5)
+
+ //• SVG_Filter_Blur
+ _O_C_TEXT:C284(SVG_Filter_Blur; $0)
+ _O_C_TEXT:C284(SVG_Filter_Blur; $1)
+ _O_C_LONGINT:C283(SVG_Filter_Blur; $2)
+ _O_C_TEXT:C284(SVG_Filter_Blur; $3)
+ _O_C_TEXT:C284(SVG_Filter_Blur; $4)
+
+ //SVG_Filter_ColorMatrix
+ _O_C_TEXT:C284(SVG_Filter_ColorMatrix; $0)
+ _O_C_TEXT:C284(SVG_Filter_ColorMatrix; $1)
+ _O_C_TEXT:C284(SVG_Filter_ColorMatrix; $2)
+ _O_C_TEXT:C284(SVG_Filter_ColorMatrix; $3)
+ _O_C_TEXT:C284(SVG_Filter_ColorMatrix; $4)
+ _O_C_TEXT:C284(SVG_Filter_ColorMatrix; $5)
+
+ //SVG_Filter_Composite
+ _O_C_TEXT:C284(SVG_Filter_Composite; $0)
+ _O_C_TEXT:C284(SVG_Filter_Composite; $1)
+ _O_C_TEXT:C284(SVG_Filter_Composite; $2)
+ _O_C_TEXT:C284(SVG_Filter_Composite; $3)
+ _O_C_TEXT:C284(SVG_Filter_Composite; $4)
+ _O_C_TEXT:C284(SVG_Filter_Composite; $5)
+
+ //SVG_Filter_Merge
+ _O_C_TEXT:C284(SVG_Filter_Merge; $0)
+ _O_C_TEXT:C284(SVG_Filter_Merge; $1)
+ _O_C_TEXT:C284(SVG_Filter_Merge; ${2})
+
+ //SVG_Filter_MergeNode
+ _O_C_TEXT:C284(SVG_Filter_MergeNode; $0)
+ _O_C_TEXT:C284(SVG_Filter_MergeNode; $1)
+ _O_C_TEXT:C284(SVG_Filter_MergeNode; $2)
+
+ //• SVG_Filter_Offset
+ _O_C_TEXT:C284(SVG_Filter_Offset; $0)
+ _O_C_TEXT:C284(SVG_Filter_Offset; $1)
+ _O_C_LONGINT:C283(SVG_Filter_Offset; $2)
+ _O_C_LONGINT:C283(SVG_Filter_Offset; $3)
+ _O_C_TEXT:C284(SVG_Filter_Offset; $4)
+ _O_C_TEXT:C284(SVG_Filter_Offset; $5)
+
+ //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
End if
If (False:C215) //UTILITIES
- //SVG_Count_elements
- C_LONGINT:C283(SVG_Count_elements ;$0)
- C_TEXT:C284(SVG_Count_elements ;$1)
+ //SVG_Count_elements
+ _O_C_LONGINT:C283(SVG_Count_elements; $0)
+ _O_C_TEXT:C284(SVG_Count_elements; $1)
- //SVG_ELEMENTS_TO_ARRAYS
- C_TEXT:C284(SVG_ELEMENTS_TO_ARRAYS ;$1)
- C_POINTER:C301(SVG_ELEMENTS_TO_ARRAYS ;$2)
- C_POINTER:C301(SVG_ELEMENTS_TO_ARRAYS ;$3)
- C_POINTER:C301(SVG_ELEMENTS_TO_ARRAYS ;$4)
+ //SVG_ELEMENTS_TO_ARRAYS
+ _O_C_TEXT:C284(SVG_ELEMENTS_TO_ARRAYS; $1)
+ _O_C_POINTER:C301(SVG_ELEMENTS_TO_ARRAYS; $2)
+ _O_C_POINTER:C301(SVG_ELEMENTS_TO_ARRAYS; $3)
+ _O_C_POINTER:C301(SVG_ELEMENTS_TO_ARRAYS; $4)
- //SVG_Estimate_weight
- C_REAL:C285(SVG_Estimate_weight ;$0)
- C_TEXT:C284(SVG_Estimate_weight ;$1)
+ //SVG_Estimate_weight
+ _O_C_REAL:C285(SVG_Estimate_weight; $0)
+ _O_C_TEXT:C284(SVG_Estimate_weight; $1)
- //SVG_Find_ID
- C_TEXT:C284(SVG_Find_ID ;$0)
- C_TEXT:C284(SVG_Find_ID ;$1)
- C_TEXT:C284(SVG_Find_ID ;$2)
+ //SVG_Find_ID
+ _O_C_TEXT:C284(SVG_Find_ID; $0)
+ _O_C_TEXT:C284(SVG_Find_ID; $1)
+ _O_C_TEXT:C284(SVG_Find_ID; $2)
- //SVG_Get_options
- C_LONGINT:C283(SVG_Get_options ;$0)
+ //SVG_Get_options
+ _O_C_LONGINT:C283(SVG_Get_options; $0)
- //SVG_Get_version
- C_TEXT:C284(SVG_Get_version ;$0)
+ //SVG_Get_version
+ _O_C_TEXT:C284(SVG_Get_version; $0)
- //SVG_Is_reference_valid
- C_BOOLEAN:C305(SVG_Is_reference_valid ;$0)
- C_TEXT:C284(SVG_Is_reference_valid ;$1)
+ //SVG_Is_reference_valid
+ _O_C_BOOLEAN:C305(SVG_Is_reference_valid; $0)
+ _O_C_TEXT:C284(SVG_Is_reference_valid; $1)
- //SVG_Read_element_type
- C_TEXT:C284(SVG_Read_element_type ;$0)
- C_TEXT:C284(SVG_Read_element_type ;$1)
+ //SVG_Read_element_type
+ _O_C_TEXT:C284(SVG_Read_element_type; $0)
+ _O_C_TEXT:C284(SVG_Read_element_type; $1)
- //SVG_Read_last_error
- C_LONGINT:C283(SVG_Read_last_error ;$0)
- C_TEXT:C284(SVG_Read_last_error ;$1)
- C_POINTER:C301(SVG_Read_last_error ;$2)
+ //SVG_Read_last_error
+ _O_C_LONGINT:C283(SVG_Read_last_error; $0)
+ _O_C_TEXT:C284(SVG_Read_last_error; $1)
+ _O_C_POINTER:C301(SVG_Read_last_error; $2)
- //SVG_References_array
- C_LONGINT:C283(SVG_References_array ;$0)
- C_POINTER:C301(SVG_References_array ;$1)
+ //SVG_References_array
+ _O_C_LONGINT:C283(SVG_References_array; $0)
+ _O_C_POINTER:C301(SVG_References_array; $1)
- //SVG_SET_DOCUMENT_VARIABLE
- C_POINTER:C301(SVG_SET_DOCUMENT_VARIABLE ;$1)
+ //SVG_SET_DOCUMENT_VARIABLE
+ _O_C_POINTER:C301(SVG_SET_DOCUMENT_VARIABLE; $1)
- //SVG_Set_error_handler
- C_TEXT:C284(SVG_Set_error_handler ;$0)
- C_TEXT:C284(SVG_Set_error_handler ;$1)
+ //SVG_Set_error_handler
+ _O_C_TEXT:C284(SVG_Set_error_handler; $0)
+ _O_C_TEXT:C284(SVG_Set_error_handler; $1)
- //SVG_Set_options
- C_LONGINT:C283(SVG_SET_OPTIONS ;$1)
+ //SVG_Set_options
+ //_O_C_LONGINT(SVG_SET_OPTIONS; $1)
- //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
End if
If (False:C215) //MISCELLANEOUS
- //SVG_ROTATION_CENTERED
- C_TEXT:C284(SVG_ROTATION_CENTERED ;$1)
- C_REAL:C285(SVG_ROTATION_CENTERED ;$2)
+ //SVG_ROTATION_CENTERED
+ _O_C_TEXT:C284(SVG_ROTATION_CENTERED; $1)
+ _O_C_REAL:C285(SVG_ROTATION_CENTERED; $2)
- //SVG_SCALLING_CENTERED
- C_TEXT:C284(SVG_SCALING_CENTERED ;$1)
- C_REAL:C285(SVG_SCALING_CENTERED ;$2)
- C_REAL:C285(SVG_SCALING_CENTERED ;$3)
- C_REAL:C285(SVG_SCALING_CENTERED ;$4)
+ //SVG_SCALLING_CENTERED
+ _O_C_TEXT:C284(SVG_SCALING_CENTERED; $1)
+ _O_C_REAL:C285(SVG_SCALING_CENTERED; $2)
+ _O_C_REAL:C285(SVG_SCALING_CENTERED; $3)
+ _O_C_REAL:C285(SVG_SCALING_CENTERED; $4)
- //SVG_SET_TRANSFORM_FLIP
- C_TEXT:C284(SVG_SET_TRANSFORM_FLIP ;$1)
- C_BOOLEAN:C305(SVG_SET_TRANSFORM_FLIP ;$2)
- C_BOOLEAN:C305(SVG_SET_TRANSFORM_FLIP ;$3)
+ //SVG_SET_TRANSFORM_FLIP
+ _O_C_TEXT:C284(SVG_SET_TRANSFORM_FLIP; $1)
+ _O_C_BOOLEAN:C305(SVG_SET_TRANSFORM_FLIP; $2)
+ _O_C_BOOLEAN:C305(SVG_SET_TRANSFORM_FLIP; $3)
End if
\ No newline at end of file
diff --git a/Project/Sources/Methods/Compiler_test.4dm b/Project/Sources/Methods/Compiler_test.4dm
deleted file mode 100644
index 07f30c5..0000000
--- a/Project/Sources/Methods/Compiler_test.4dm
+++ /dev/null
@@ -1,5 +0,0 @@
-//%attributes = {"invisible":true}
-
-If (False:C215)
- C_TEXT:C284(testCallbackMethod; $1)
-End if
\ No newline at end of file
diff --git a/Project/Sources/Methods/Component_about.4dm b/Project/Sources/Methods/Component_about.4dm
index 503c731..4f67e5b 100644
--- a/Project/Sources/Methods/Component_about.4dm
+++ b/Project/Sources/Methods/Component_about.4dm
@@ -3,14 +3,7 @@
// Method : Component_about
// Created 17/09/08 by Vincent de Lachaux
// ----------------------------------------------------
-// Description
-//
-// ----------------------------------------------------
-var $1 : Text
-
-If (False:C215)
- C_TEXT:C284(Component_about; $1)
-End if
+#DECLARE($action : Text)
var $window : Integer
@@ -25,4 +18,4 @@ Else
DIALOG:C40("About")
CLOSE WINDOW:C154
-End if
+End if
\ No newline at end of file
diff --git a/Project/Sources/Methods/Component_defaultOptions.4dm b/Project/Sources/Methods/Component_defaultOptions.4dm
index 0d2329b..416ad8a 100644
--- a/Project/Sources/Methods/Component_defaultOptions.4dm
+++ b/Project/Sources/Methods/Component_defaultOptions.4dm
@@ -3,38 +3,35 @@
// Method : Component_defaultOptions
// Created 23/09/08 by Vincent de Lachaux
// ----------------------------------------------------
-// Description
-//
-// ----------------------------------------------------
-var $0 : Integer
-
-If (False:C215)
- C_LONGINT:C283(Component_defaultOptions; $0)
-End if
-
-$0:=0 ?- 1 //Do not automatically assign ID
-$0:=$0 ?- 2 //Do not automatically close objects
-$0:=$0 ?+ 3 //With background
-$0:=$0 ?+ 4 //Absolute coordinate
-$0:=$0 ?- 5 //Not indented
-$0:=$0 ?+ 6 //BEEP on error
-$0:=$0 ?- 7 //Install error-catching method
-$0:=$0 ?+ 8 //Image transparente
-$0:=$0 ?- 9 //trigonometric origin
+#DECLARE() : Integer
+
+var $options : Integer
+
+$options:=0 ?- 1 //Do not automatically assign ID
+$options:=$options ?- 2 //Do not automatically close objects
+$options:=$options ?+ 3 //With background
+$options:=$options ?+ 4 //Absolute coordinate
+$options:=$options ?- 5 //Not indented
+$options:=$options ?+ 6 //BEEP on error
+$options:=$options ?- 7 //Install error-catching method
+$options:=$options ?+ 8 //Image transparente
+$options:=$options ?- 9 //trigonometric origin
// Added by Vincent de Lachaux (18/03/10)
-$0:=$0 ?+ 10 //Substitute 'Arial Unicode MS' to 'Arial'
-$0:=$0 ?- 11 //Default Shape-rendering to 'crispEdges'
+$options:=$options ?+ 10 //Substitute 'Arial Unicode MS' to 'Arial'
+$options:=$options ?- 11 //Default Shape-rendering to 'crispEdges'
// Added by Vincent de Lachaux (11/04/12)
-$0:=$0 ?+ 12 //Parameter control is ON
+$options:=$options ?+ 12 //Parameter control is ON
-$0:=$0 ?- 13 //xml:space="preserve" turn around is OFF
+$options:=$options ?- 13 //xml:space="preserve" turn around is OFF
-$0:=$0 ?- 14 //centered rotation is OFF
+$options:=$options ?- 14 //centered rotation is OFF
// #18-3-2015
-$0:=$0 ?- 15 //don't add default style attributes
+$options:=$options ?- 15 //don't add default style attributes
// #21-7-2016
-$0:=$0 ?+ 16 //add the "xlink:href" by default
\ No newline at end of file
+$options:=$options ?+ 16 //add the "xlink:href" by default
+
+return $options
\ No newline at end of file
diff --git a/Project/Sources/Methods/Component_init.4dm b/Project/Sources/Methods/Component_init.4dm
index 3a7ff3c..b7f4ae8 100644
--- a/Project/Sources/Methods/Component_init.4dm
+++ b/Project/Sources/Methods/Component_init.4dm
@@ -1,21 +1,17 @@
//%attributes = {"invisible":true,"preemptive":"capable"}
- // ----------------------------------------------------
- // Method : Component_init
- // Created 16/06/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- // Initialisations of the component's objects
- // ----------------------------------------------------
-C_BOOLEAN:C305($0)
+// ----------------------------------------------------
+// Method : Component_init
+// Created 16/06/08 by Vincent de Lachaux
+// ----------------------------------------------------
+// Description
+// Initialisations of the component's objects
+// ----------------------------------------------------
+#DECLARE() : Boolean
-C_TEXT:C284($Txt_list;$Txt_value)
-C_OBJECT:C1216($Obj_list;$Obj_svg)
+var $Txt_list; $Txt_value : Text
+var $Obj_list; $Obj_svg : Object
-If (False:C215)
- C_BOOLEAN:C305(Component_init ;$0)
-End if
-
- // Make component usable in preemptive processes
+// Make component usable in preemptive processes
If (Storage:C1525.svg=Null:C1517)
$Obj_svg:=New shared object:C1526
@@ -28,42 +24,42 @@ If (Storage:C1525.svg=Null:C1517)
Use ($Obj_svg)
- // Default options
- $Obj_svg.options:=Component_defaultOptions
+ // Default options
+ $Obj_svg.options:=Component_defaultOptions
- // Default values
+ // Default values
$Obj_svg.strokeColor:="black"
$Obj_svg.fillColor:="white"
$Obj_svg.encoding:="UTF-8"
- // Constants
+ // Constants
$Obj_svg.fe_inValues:="SourceGraphic|SourceAlpha|"
$Obj_svg.fe_in2Values:="over|in|out|atop|"
$Obj_svg.feComposite_operatorValues:="over|normal|in|out|atop|"
$Obj_svg.feColorMatrix_typeValues:="matrix|saturate|hueRotate|luminanceToAlpha|"
- // Lists
+ // Lists
$Obj_list:=JSON Parse:C1218(Document to text:C1236(Get 4D folder:C485(Current resources folder:K5:16)+"lists.json"))
- For each ($Txt_list;$Obj_list)
+ For each ($Txt_list; $Obj_list)
$Obj_svg[$Txt_list]:=New shared collection:C1527
- For each ($Txt_value;$Obj_list[$Txt_list])
+ For each ($Txt_value; $Obj_list[$Txt_list])
$Obj_svg[$Txt_list].push($Txt_value)
End for each
End for each
- $Obj_svg.generator:=Replace string:C233(Replace string:C233("4D SVG v{v} ©4D SAS, {y}.";"{v}";SVG_Get_version );"{y}";"2008-"+String:C10(Year of:C25(Current date:C33)))
- $Obj_svg.system:=Get system info:C1571.osVersion
+ $Obj_svg.generator:=Replace string:C233(Replace string:C233("4D SVG v{v} ©4D SAS, {y}."; "{v}"; SVG_Get_version); "{y}"; "2008-"+String:C10(Year of:C25(Current date:C33)))
+ $Obj_svg.system:=System info:C1571.osVersion
End use
End if
- // Version update of the stored datas {
- // Get the latest version number and compare the current number
- //
-$0:=True:C214 //True if all is OK
- //}
\ No newline at end of file
+// Version update of the stored datas
+// Get the latest version number and compare the current number
+//
+
+return True:C214 // True if all is OK
diff --git a/Project/Sources/Methods/SVGTool_Display_colors.4dm b/Project/Sources/Methods/SVGTool_Display_colors.4dm
index 6d0bae6..af88d56 100644
--- a/Project/Sources/Methods/SVGTool_Display_colors.4dm
+++ b/Project/Sources/Methods/SVGTool_Display_colors.4dm
@@ -1,15 +1,8 @@
//%attributes = {"invisible":true,"shared":true}
- // ----------------------------------------------------
- // Method : SVGTool_Display_colors
- // Created 16/09/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
-C_POINTER:C301($1)
+// ----------------------------------------------------
+// Method : SVGTool_Display_colors
+// Created 16/09/08 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($ptr : Pointer)
-If (False:C215)
- C_POINTER:C301(SVGTool_Display_colors ;$1)
-End if
-
-Color_main
\ No newline at end of file
+Color_main
\ No newline at end of file
diff --git a/Project/Sources/Methods/SVGTool_Display_syntax.4dm b/Project/Sources/Methods/SVGTool_Display_syntax.4dm
index 9999a4e..dc859e1 100644
--- a/Project/Sources/Methods/SVGTool_Display_syntax.4dm
+++ b/Project/Sources/Methods/SVGTool_Display_syntax.4dm
@@ -1,15 +1,8 @@
//%attributes = {"invisible":true,"shared":true}
- // ----------------------------------------------------
- // Method : SVGTool_Display_syntax
- // Created 14/11/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
-C_POINTER:C301($1)
+// ----------------------------------------------------
+// Method : SVGTool_Display_syntax
+// Created 14/11/08 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($ptr : Pointer)
-If (False:C215)
- C_POINTER:C301(SVGTool_Display_syntax ;$1)
-End if
-
-Syntax_main
\ No newline at end of file
+Syntax_main
\ No newline at end of file
diff --git a/Project/Sources/Methods/SVGTool_Display_viewer.4dm b/Project/Sources/Methods/SVGTool_Display_viewer.4dm
index f46c7fd..35475f2 100644
--- a/Project/Sources/Methods/SVGTool_Display_viewer.4dm
+++ b/Project/Sources/Methods/SVGTool_Display_viewer.4dm
@@ -1,15 +1,8 @@
//%attributes = {"invisible":true,"shared":true}
- // ----------------------------------------------------
- // Method : SVGTool_Display_viewer
- // Created 01/10/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
-C_POINTER:C301($1)
+// ----------------------------------------------------
+// Method : SVGTool_Display_viewer
+// Created 01/10/08 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($ptr : Pointer)
-If (False:C215)
- C_POINTER:C301(SVGTool_Display_viewer ;$1)
-End if
-
-Viewer_main
\ No newline at end of file
+Viewer_main
\ No newline at end of file
diff --git a/Project/Sources/Methods/SVGTool_SET_VIEWER_CALLBACK.4dm b/Project/Sources/Methods/SVGTool_SET_VIEWER_CALLBACK.4dm
index 098aaae..9473fb9 100644
--- a/Project/Sources/Methods/SVGTool_SET_VIEWER_CALLBACK.4dm
+++ b/Project/Sources/Methods/SVGTool_SET_VIEWER_CALLBACK.4dm
@@ -1,25 +1,10 @@
//%attributes = {"invisible":true,"shared":true,"preemptive":"incapable"}
- // ----------------------------------------------------
- // Method : SVGTool_SET_VIEWER_CALLBACK
- // Created 06/11/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
-C_TEXT:C284($1)
+// ----------------------------------------------------
+// Method : SVGTool_SET_VIEWER_CALLBACK
+// Created 06/11/08 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($callback : Text)
-If (False:C215)
- C_TEXT:C284(SVGTool_SET_VIEWER_CALLBACK ;$1)
-End if
+Compiler_SVG
-Compiler_SVG
-
-If (Count parameters:C259>=1)
-
- <>SVG_Txt_Viewer_Callback_Method:=$1
-
-Else
-
- <>SVG_Txt_Viewer_Callback_Method:=""
-
-End if
\ No newline at end of file
+<>SVG_Txt_Viewer_Callback_Method:=$callback
\ No newline at end of file
diff --git a/Project/Sources/Methods/SVGTool_SHOW_IN_VIEWER.4dm b/Project/Sources/Methods/SVGTool_SHOW_IN_VIEWER.4dm
index ef7fee3..f55944f 100644
--- a/Project/Sources/Methods/SVGTool_SHOW_IN_VIEWER.4dm
+++ b/Project/Sources/Methods/SVGTool_SHOW_IN_VIEWER.4dm
@@ -1,34 +1,25 @@
//%attributes = {"invisible":true,"shared":true,"preemptive":"incapable"}
- // ----------------------------------------------------
- // Method : SVGTool_SHOW_IN_VIEWER
- // Created 01/10/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
-C_TEXT:C284($1)
-C_TEXT:C284($2)
-
-C_TEXT:C284($Txt_sources)
-
-If (False:C215)
- C_TEXT:C284(SVGTool_SHOW_IN_VIEWER ;$1)
- C_TEXT:C284(SVGTool_SHOW_IN_VIEWER ;$2)
-End if
+// ----------------------------------------------------
+// Method : SVGTool_SHOW_IN_VIEWER
+// Created 01/10/08 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($root : Text; $page : Text)
+
+var $sources : Text
-Compiler_SVG
+Compiler_SVG
-COMPILER_Not_Thread_Safe
+COMPILER_Not_Thread_Safe
-DOM EXPORT TO VAR:C863($1;$Txt_sources)
+DOM EXPORT TO VAR:C863($root; $sources)
If (<>sourceFontSize=0)
- PREFERENCES ("viewerOptions";-><>showColoredBackground;-><>backgroundColor;-><>automaticallyResize;-><>sourceFontSize)
+ PREFERENCES("viewerOptions"; -><>showColoredBackground; -><>backgroundColor; -><>automaticallyResize; -><>sourceFontSize)
End if
-<>SVG_viewerSource:=viewer_sources ($Txt_sources)
+<>SVG_viewerSource:=viewer_sources($sources)
Use (Storage:C1525.svg)
@@ -36,7 +27,7 @@ Use (Storage:C1525.svg)
If (Count parameters:C259>=2)
- If ($2="sources")
+ If ($page="sources")
Storage:C1525.svg.options:=Storage:C1525.svg.options ?+ 0
@@ -44,4 +35,4 @@ Use (Storage:C1525.svg)
End if
End use
-Viewer_main
\ No newline at end of file
+Viewer_main
\ No newline at end of file
diff --git a/Project/Sources/Methods/SVG_ABOUT.4dm b/Project/Sources/Methods/SVG_ABOUT.4dm
index df8e9d2..41c730c 100644
--- a/Project/Sources/Methods/SVG_ABOUT.4dm
+++ b/Project/Sources/Methods/SVG_ABOUT.4dm
@@ -1,15 +1,8 @@
//%attributes = {"invisible":true,"shared":true,"preemptive":"incapable"}
- // ----------------------------------------------------
- // Method : SVG_ABOUT
- // Created 17/09/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
-C_POINTER:C301($1)
+// ----------------------------------------------------
+// Method : SVG_ABOUT
+// Created 17/09/08 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($ptr : Pointer)
-If (False:C215)
- C_POINTER:C301(SVG_ABOUT ;$1)
-End if
-
-Component_about
\ No newline at end of file
+Component_about
\ No newline at end of file
diff --git a/Project/Sources/Methods/SVG_Is_reference_valid.4dm b/Project/Sources/Methods/SVG_Is_reference_valid.4dm
index b1fdeeb..36b7dc8 100644
--- a/Project/Sources/Methods/SVG_Is_reference_valid.4dm
+++ b/Project/Sources/Methods/SVG_Is_reference_valid.4dm
@@ -1,25 +1,25 @@
//%attributes = {"invisible":true,"shared":true,"preemptive":"capable"}
- // ----------------------------------------------------
- // Method : SVG_Is_reference_valid
- // Created 17/06/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- // To test whether a given Reference value is a valid SVG element reference
- // ----------------------------------------------------
- // Modified by Vincent de Lachaux (16/04/10)
- // v12 simplification
+// ----------------------------------------------------
+// Method : SVG_Is_reference_valid
+// Created 17/06/08 by Vincent de Lachaux
+// ----------------------------------------------------
+// Description
+// To test whether a given Reference value is a valid SVG element reference
+// ----------------------------------------------------
+// Modified by Vincent de Lachaux (16/04/10)
+// v12 simplification
C_BOOLEAN:C305($0)
C_TEXT:C284($1)
C_LONGINT:C283($Lon_parameters)
-C_TEXT:C284($Dom_root;$Dom_svgObject;$kTxt_currentMethod;$Txt_name)
+C_TEXT:C284($Dom_root; $Dom_svgObject; $kTxt_currentMethod; $Txt_name)
If (False:C215)
- C_BOOLEAN:C305(SVG_Is_reference_valid ;$0)
- C_TEXT:C284(SVG_Is_reference_valid ;$1)
+ C_BOOLEAN:C305(SVG_Is_reference_valid; $0)
+ C_TEXT:C284(SVG_Is_reference_valid; $1)
End if
-Compiler_SVG
+Compiler_SVG
$Lon_parameters:=Count parameters:C259
$kTxt_currentMethod:="SVG_Is_reference_valid" //Nom methode courante
@@ -28,18 +28,18 @@ If ($Lon_parameters>=1)
$Dom_svgObject:=$1
- // Modified by Vincent de Lachaux (31/05/12)
- //ACI0076861
- Component_errorHandler ("ERROR_OFF")
+ // Modified by Vincent de Lachaux (31/05/12)
+ //ACI0076861
+ Component_errorHandler("ERROR_OFF")
$Dom_root:=DOM Get root XML element:C1053($Dom_svgObject)
- Component_errorHandler ("ERROR_ON")
+ Component_errorHandler("ERROR_ON")
If (OK=1)
- //Verify the root name
- DOM GET XML ELEMENT NAME:C730($Dom_root;$Txt_name)
+ //Verify the root name
+ DOM GET XML ELEMENT NAME:C730($Dom_root; $Txt_name)
End if
@@ -47,6 +47,6 @@ If ($Lon_parameters>=1)
Else
- ASSERT:C1129(Component_putError (8850;$kTxt_currentMethod)) //Parameters Missing
+ ASSERT:C1129(Component_putError(8850; $kTxt_currentMethod)) //Parameters Missing
End if
\ No newline at end of file
diff --git a/Project/Sources/Methods/SVG_SET_OPTIONS.4dm b/Project/Sources/Methods/SVG_SET_OPTIONS.4dm
index f96b660..b31ed0f 100644
--- a/Project/Sources/Methods/SVG_SET_OPTIONS.4dm
+++ b/Project/Sources/Methods/SVG_SET_OPTIONS.4dm
@@ -1,42 +1,32 @@
//%attributes = {"invisible":true,"shared":true,"preemptive":"capable"}
- // ----------------------------------------------------
- // Method : SVG_SET_OPTIONS
- // Created 21/08/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- // SVG_SET_OPTIONS sets all of the SVG Component options using a 32-bit number, which
- // contains bits representing the different options.
- // ----------------------------------------------------
-C_LONGINT:C283($1)
-
-C_LONGINT:C283($Lon_parameters)
-
-If (False:C215)
- C_LONGINT:C283(SVG_SET_OPTIONS ;$1)
-End if
-
+// ----------------------------------------------------
+// Method : SVG_SET_OPTIONS
+// Created 21/08/08 by Vincent de Lachaux
+// ----------------------------------------------------
+// Description
+// SVG_SET_OPTIONS sets all of the SVG Component options using a 32-bit number, which
+// Contains bits representing the different options.
+// ----------------------------------------------------
+#DECLARE($options : Integer)
If (Storage:C1525.svg=Null:C1517)
- Compiler_SVG
+ Compiler_SVG
End if
-
-$Lon_parameters:=Count parameters:C259
-
Use (Storage:C1525.svg)
- If ($Lon_parameters>=1)
+ If (Count parameters:C259>=1)
- Storage:C1525.svg.options:=$1
+ Storage:C1525.svg.options:=$options
Else
- Storage:C1525.svg.options:=Component_defaultOptions
+ Storage:C1525.svg.options:=Component_defaultOptions
End if
End use
- // Added by Vincent de Lachaux (11/04/12)
-SET ASSERT ENABLED:C1131(Storage:C1525.svg.options ?? 12;*)
\ No newline at end of file
+// Added by Vincent de Lachaux (11/04/12)
+SET ASSERT ENABLED:C1131(Storage:C1525.svg.options ?? 12; *)
\ No newline at end of file
diff --git a/Project/Sources/Methods/Syntax_help.4dm b/Project/Sources/Methods/Syntax_help.4dm
index 214a5fc..dd785a5 100644
--- a/Project/Sources/Methods/Syntax_help.4dm
+++ b/Project/Sources/Methods/Syntax_help.4dm
@@ -1,53 +1,28 @@
//%attributes = {"invisible":true}
- // ----------------------------------------------------
- // Project method : Syntax_help
- // Database: 4D SVG
- // ID[485C6D26F7D24E3AB05D34BFE1D041B8]
- // Created #22-5-2013 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description:
- //
- // ----------------------------------------------------
- // Declarations
-C_TEXT:C284($1)
+// ----------------------------------------------------
+// Project method : Syntax_help
+// Database: 4D SVG
+// ID[485C6D26F7D24E3AB05D34BFE1D041B8]
+// Created #22-5-2013 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($page : Text)
-C_LONGINT:C283($Lon_parameters)
-C_TEXT:C284($kTxt_webArea;$Txt_language;$Txt_url;$Txt_version)
+var $language; $url; $version; $WEB_AREA : Text
-If (False:C215)
- C_TEXT:C284(Syntax_help ;$1)
-End if
+$WEB_AREA:="help"
- // ----------------------------------------------------
- // Initialisations
-$Lon_parameters:=Count parameters:C259
+$language:=WA Evaluate JavaScript:C1029(*; $WEB_AREA; "document.getElementsByTagName('html')[0].lang")
-If (Asserted:C1132($Lon_parameters>=1;"Missing parameter"))
-
- $kTxt_webArea:="help"
-
-Else
+If (Length:C16($language)=0)
- ABORT:C156
+ $language:=Replace string:C233(Replace string:C233(\
+ Localized document path:C1105("4DPop.xlf"); Get 4D folder:C485(Current resources folder:K5:16); "")\
+ ; ".lproj"+Folder separator:K24:12+"4DPop.xlf"; "")
End if
- // ----------------------------------------------------
-$Txt_language:=WA Evaluate JavaScript:C1029(*;$kTxt_webArea;"document.getElementsByTagName('html')[0].lang")
-
-If (Length:C16($Txt_language)=0)
-
- $Txt_language:=Replace string:C233(Replace string:C233(\
- Get localized document path:C1105("4DPop.xlf");Get 4D folder:C485(Current resources folder:K5:16);"")\
- ;".lproj"+Folder separator:K24:12+"4DPop.xlf";"")
-
-End if
-
-$Txt_version:=Substring:C12(Application version:C493;1;2)
-
-$Txt_url:="http://doc.4d.com/4Dv"+$Txt_version+"/help/Title/"+Choose:C955($Txt_language="";"en";$Txt_language)+"/page"+$1+".html"
+$version:=Substring:C12(Application version:C493; 1; 2)
-WA OPEN URL:C1020(*;$kTxt_webArea;$Txt_url)
+$url:="http://doc.4d.com/4Dv"+$version+"/help/Title/"+Choose:C955($language=""; "en"; $language)+"/page"+$page+".html"
- // ----------------------------------------------------
- // End
\ No newline at end of file
+WA OPEN URL:C1020(*; $WEB_AREA; $url)
\ No newline at end of file
diff --git a/Project/Sources/Methods/Syntax_main.4dm b/Project/Sources/Methods/Syntax_main.4dm
index da2bb98..744326f 100644
--- a/Project/Sources/Methods/Syntax_main.4dm
+++ b/Project/Sources/Methods/Syntax_main.4dm
@@ -1,81 +1,46 @@
//%attributes = {"invisible":true}
- // ----------------------------------------------------
- // Method : Syntax_main
- // Created 16/09/08 by vdl
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
-C_TEXT:C284($1)
+// ----------------------------------------------------
+// Method : Syntax_main
+// Created 16/09/08 by vdl
+// ----------------------------------------------------
+#DECLARE($action : Text)
-C_LONGINT:C283($Lon_parameters;$Lon_windowRef)
-C_TEXT:C284($Txt_entryPoint)
-
-If (False:C215)
- C_TEXT:C284(Syntax_main ;$1)
-End if
-
-$Lon_parameters:=Count parameters:C259
-
-If ($Lon_parameters>=1)
-
- $Txt_entryPoint:=$1
-
-End if
+var $winRef : Integer
Case of
- //___________________________________________________________
- : (Length:C16($Txt_entryPoint)=0)
+ //___________________________________________________________
+ : (Length:C16($action)=0)
Case of
- //……………………………………………………………………
+ //……………………………………………………………………
: (Method called on error:C704=Current method name:C684)
- //……………………………………………………………………
+ //……………………………………………………………………
Else
- //This method must be executed in a new process
- BRING TO FRONT:C326(New process:C317(Current method name:C684;0;"$"+Current method name:C684;"_run";*))
+ // This method must be executed in a new process
+ BRING TO FRONT:C326(New process:C317(Current method name:C684; 0; "$"+Current method name:C684; "_run"; *))
- //……………………………………………………………………
+ //……………………………………………………………………
End case
- //___________________________________________________________
- : ($Txt_entryPoint="Editor")
+ //___________________________________________________________
- //___________________________________________________________
- : ($Txt_entryPoint="_run")
-
- //First launch of this method executed in a new process
- Syntax_main ("_declarations")
- Syntax_main ("_init")
-
- //$Lon_windowRef:=Open form window("syntaxPalette";Palette form window;On the left;At the top;*)
- $Lon_windowRef:=Open form window:C675("syntaxPalette";Plain form window:K39:10+4096;On the left:K39:2;At the top:K39:5;*)
- DIALOG:C40("syntaxPalette")
+ : ($action="Editor")
- Syntax_main ("_deinit")
+ //___________________________________________________________
+ : ($action="_run")
- //___________________________________________________________
- : ($Txt_entryPoint="_declarations")
+ // First launch of this method executed in a new process
+ Compiler_SVG
+ COMPILER_Not_Thread_Safe
- Compiler_SVG
- COMPILER_Not_Thread_Safe
-
- //___________________________________________________________
- : ($Txt_entryPoint="_init")
-
- //___________________________________________________________
- : ($Txt_entryPoint="_deinit")
-
- CLEAR LIST:C377(<>lst_syntax;*)
-
- //___________________________________________________________
- Else
+ $winRef:=Open form window:C675("syntaxPalette"; Plain form window:K39:10+4096; On the left:K39:2; At the top:K39:5; *)
+ DIALOG:C40("syntaxPalette")
- TRACE:C157
+ CLEAR LIST:C377(<>lst_syntax; *)
- //___________________________________________________________
+ //___________________________________________________________
End case
\ No newline at end of file
diff --git a/Project/Sources/Methods/Viewer_main.4dm b/Project/Sources/Methods/Viewer_main.4dm
index 94e0736..d95e556 100644
--- a/Project/Sources/Methods/Viewer_main.4dm
+++ b/Project/Sources/Methods/Viewer_main.4dm
@@ -6,186 +6,153 @@
// Modified by Vincent de Lachaux (11/04/11)
// Added svgz support
// ----------------------------------------------------
-C_TEXT:C284($1)
-C_TEXT:C284($2)
+#DECLARE($action : Text; $choice : Text)
-C_BOOLEAN:C305($Boo_recent)
-C_LONGINT:C283($Lon_bottom; $Lon_color; $Lon_height; $Lon_i; $Lon_left; $Lon_line)
-C_LONGINT:C283($Lon_menu; $Lon_parameters; $Lon_right; $Lon_top; $Lon_width; $Lon_windowRef)
-C_PICTURE:C286($Pic_buffer)
-C_REAL:C285($Num_offset)
-C_TEXT:C284($Txt_buffer; $Txt_entryPoint; $Txt_mark; $Txt_menu; $Txt_menuBar; $Txt_Path)
-C_TEXT:C284($Txt_root; $Txt_tempo)
-
-If (False:C215)
- C_TEXT:C284(Viewer_main; $1)
- C_TEXT:C284(Viewer_main; $2)
-End if
-
-$Lon_parameters:=Count parameters:C259
-
-If ($Lon_parameters>=1)
-
- $Txt_entryPoint:=$1
-
-End if
+var $offset : Real
+var $t; $mark; $menu; $menuBar; $path; $root : Text
+var $tempo : Text
+var $pic : Picture
+var $recent : Boolean
+var $bottom; $color; $height; $i; $left; $selectedLine : Integer
+var $selectedMenu; $right; $top; $width; $winRef : Integer
Case of
//___________________________________________________________
- : (Length:C16($Txt_entryPoint)=0)
+ : (Length:C16($action)=0)
- Case of
-
- //……………………………………………………………………
- : (Method called on error:C704=Current method name:C684)
-
- //……………………………………………………………………
- Else
-
- //This method must be executed in a new process
- BRING TO FRONT:C326(New process:C317(Current method name:C684; 0; Current method name:C684; "_run"; *))
-
- //……………………………………………………………………
- End case
+ //This method must be executed in a new process
+ BRING TO FRONT:C326(New process:C317(Current method name:C684; 0; Current method name:C684; "_run"; *))
//___________________________________________________________
- : ($Txt_entryPoint="menu")
+ : ($action="menu")
- If ($Lon_parameters>=2)
-
- $Txt_buffer:=$2
-
- Else
-
- $Txt_buffer:=Get selected menu item parameter:C1005
-
- End if
+ $choice:=$choice || Get selected menu item parameter:C1005
Case of
//…………………………………………………………
- : ($Txt_buffer="open@")
+ : ($choice="open@")
- If ($Lon_parameters>=2)
+ If (Count parameters:C259>=2)
- $Txt_Path:=Replace string:C233($2; "open"; ""; 1)
- $Boo_recent:=($Txt_Path="_recent@")
- $Txt_Path:=Replace string:C233($Txt_Path; "_recent"; ""; 1)
+ $path:=Replace string:C233($choice; "open"; ""; 1)
+ $recent:=($path="_recent@")
+ $path:=Replace string:C233($path; "_recent"; ""; 1)
Else
- READ PICTURE FILE:C678(""; $Pic_buffer)
+ READ PICTURE FILE:C678(""; $pic)
If (OK=1)
- $Txt_Path:=Document
+ $path:=Document
End if
End if
- If (Length:C16($Txt_path)>0)
+ If (Length:C16($path)>0)
- If (Test path name:C476($Txt_path)=Is a document:K24:1)
+ If (Test path name:C476($path)=Is a document:K24:1)
- ON ERR CALL:C155("Viewer_main") //=========================== < NO ERROR >
-
- // Modified by Vincent de Lachaux (11/04/11)
- // Added svgz support {
- If ($Txt_Path="@.svgz")
-
- READ PICTURE FILE:C678($Txt_Path; $Pic_buffer)
+ Try //=========================== < NO ERROR >
- If (OK=1)
+ // Modified by Vincent de Lachaux (11/04/11)
+ // Added svgz support {
+ If ($path="@.svgz")
- $Txt_tempo:=Temporary folder:C486+"tempo.svg"
-
- WRITE PICTURE FILE:C680($Txt_tempo; $Pic_buffer; ".svg")
+ READ PICTURE FILE:C678($path; $pic)
If (OK=1)
- $Txt_root:=DOM Parse XML source:C719($Txt_tempo)
+ $tempo:=Temporary folder:C486+"tempo.svg"
- DELETE DOCUMENT:C159($Txt_tempo)
+ WRITE PICTURE FILE:C680($tempo; $pic; ".svg")
+ If (OK=1)
+
+ $root:=DOM Parse XML source:C719($tempo)
+
+ DELETE DOCUMENT:C159($tempo)
+
+ End if
End if
+
+ Else
+
+ $root:=DOM Parse XML source:C719($path)
+
End if
+ //}
- Else
-
- $Txt_root:=DOM Parse XML source:C719($Txt_path)
-
- End if
- //}
-
- If (OK=1)
-
- SVG EXPORT TO PICTURE:C1017($Txt_root; <>SVG_viewerPicture; Copy XML data source:K45:17)
- <>SVG_viewerPictureBackup:=<>SVG_viewerPicture
-
- DOM EXPORT TO VAR:C863($Txt_root; $Txt_buffer)
- <>SVG_viewerSource:=viewer_sources($Txt_buffer)
-
- If (Not:C34($Boo_recent))
+ If (OK=1)
- If (Count menu items:C405(<>svg_recentMenuRef)>0)
-
- INSERT MENU ITEM:C412(<>svg_recentMenuRef; 0; xToolbox_GetLastItemFromPath($Txt_Path))
- SET MENU ITEM PROPERTY:C973(<>svg_recentMenuRef; -1; "path"; $Txt_Path)
- SET MENU ITEM PARAMETER:C1004(<>svg_recentMenuRef; -1; "recent_"+String:C10(Count menu items:C405(<>svg_recentMenuRef)))
-
- Else
-
- APPEND MENU ITEM:C411(<>svg_recentMenuRef; xToolbox_GetLastItemFromPath($Txt_Path))
- SET MENU ITEM PROPERTY:C973(<>svg_recentMenuRef; -1; "path"; $Txt_Path)
- SET MENU ITEM PARAMETER:C1004(<>svg_recentMenuRef; -1; "recent_"+String:C10(Count menu items:C405(<>svg_recentMenuRef)))
-
- APPEND MENU ITEM:C411(<>svg_recentMenuRef; "-")
- APPEND MENU ITEM:C411(<>svg_recentMenuRef; Get localized string:C991("clearMenu"))
- SET MENU ITEM PARAMETER:C1004(<>svg_recentMenuRef; -1; "recentClear")
-
- ENABLE MENU ITEM:C149(1; 2)
+ SVG EXPORT TO PICTURE:C1017($root; <>SVG_viewerPicture; Copy XML data source:K45:17)
+ <>SVG_viewerPictureBackup:=<>SVG_viewerPicture
+
+ DOM EXPORT TO VAR:C863($root; $t)
+ <>SVG_viewerSource:=viewer_sources($t)
+
+ If (Not:C34($recent))
+ If (Count menu items:C405(<>svg_recentMenuRef)>0)
+
+ INSERT MENU ITEM:C412(<>svg_recentMenuRef; 0; xToolbox_GetLastItemFromPath($path))
+ SET MENU ITEM PROPERTY:C973(<>svg_recentMenuRef; -1; "path"; $path)
+ SET MENU ITEM PARAMETER:C1004(<>svg_recentMenuRef; -1; "recent_"+String:C10(Count menu items:C405(<>svg_recentMenuRef)))
+
+ Else
+
+ APPEND MENU ITEM:C411(<>svg_recentMenuRef; xToolbox_GetLastItemFromPath($path))
+ SET MENU ITEM PROPERTY:C973(<>svg_recentMenuRef; -1; "path"; $path)
+ SET MENU ITEM PARAMETER:C1004(<>svg_recentMenuRef; -1; "recent_"+String:C10(Count menu items:C405(<>svg_recentMenuRef)))
+
+ APPEND MENU ITEM:C411(<>svg_recentMenuRef; "-")
+ APPEND MENU ITEM:C411(<>svg_recentMenuRef; Localized string:C991("clearMenu"))
+ SET MENU ITEM PARAMETER:C1004(<>svg_recentMenuRef; -1; "recentClear")
+
+ ENABLE MENU ITEM:C149(1; 2)
+
+ End if
End if
+
+ <>Lon_viewerTimerEvent:=1
+ SET TIMER:C645(-1)
+
End if
- <>Lon_viewerTimerEvent:=1
- SET TIMER:C645(-1)
+ DOM CLOSE XML:C722($root)
- End if
-
- DOM CLOSE XML:C722($Txt_root)
-
- ON ERR CALL:C155("") //====================================
+ End try //====================================
End if
End if
//…………………………………………………………
- : ($Txt_buffer="close")
+ : ($choice="close")
CANCEL:C270
//…………………………………………………………
- : ($Txt_buffer="save")
+ : ($choice="save")
WRITE PICTURE FILE:C680(""; <>SVG_viewerPicture; ".svg")
//…………………………………………………………
- : ($Txt_buffer="showColoredBackground")
+ : ($choice="showColoredBackground")
- $Lon_menu:=Menu selected:C152\65536
- $Lon_line:=Menu selected:C152%65536
- $Txt_mark:=Get menu item mark:C428($Lon_menu; $Lon_line)
+ $selectedMenu:=Menu selected:C152\65536
+ $selectedLine:=Menu selected:C152%65536
+ $mark:=Get menu item mark:C428($selectedMenu; $selectedLine)
- If (Length:C16($Txt_mark)=0)
+ If (Length:C16($mark)=0)
- SET MENU ITEM MARK:C208($Lon_menu; $Lon_line; Char:C90(18))
+ SET MENU ITEM MARK:C208($selectedMenu; $selectedLine; Char:C90(18))
<>showColoredBackground:=True:C214
Else
- SET MENU ITEM MARK:C208($Lon_menu; $Lon_line; "")
+ SET MENU ITEM MARK:C208($selectedMenu; $selectedLine; "")
<>showColoredBackground:=False:C215
End if
@@ -194,73 +161,73 @@ Case of
OBJECT SET VISIBLE:C603(*; "_background"; Not:C34(<>showColoredBackground))
//…………………………………………………………
- : ($Txt_buffer="backgroundColor")
+ : ($choice="backgroundColor")
- $Lon_color:=Select RGB color:C956(<>backgroundColor)
+ $color:=Select RGB color:C956(<>backgroundColor)
If (OK=1)
- <>backgroundColor:=$Lon_color
+ <>backgroundColor:=$color
OBJECT SET RGB COLORS:C628(*; "_back"; <>backgroundColor; <>backgroundColor)
End if
//…………………………………………………………
- : ($Txt_buffer="actualSize")
+ : ($choice="actualSize")
<>SVG_viewerPicture:=<>SVG_viewerPictureBackup
<>Lon_viewerTimerEvent:=1
SET TIMER:C645(-1)
//…………………………………………………………
- : ($Txt_buffer="zoomToFit")
+ : ($choice="zoomToFit")
- PICTURE PROPERTIES:C457(<>SVG_viewerPictureBackup; $Lon_width; $Lon_height)
- OBJECT GET COORDINATES:C663(*; "_back"; $Lon_left; $Lon_top; $Lon_right; $Lon_bottom)
+ PICTURE PROPERTIES:C457(<>SVG_viewerPictureBackup; $width; $height)
+ OBJECT GET COORDINATES:C663(*; "_back"; $left; $top; $right; $bottom)
- $Num_offset:=Choose:C955($Lon_width>$Lon_height; ($Lon_right-$Lon_left)/$Lon_width; ($Lon_bottom-$Lon_top)/$Lon_height)
+ $offset:=Choose:C955($width>$height; ($right-$left)/$width; ($bottom-$top)/$height)
<>SVG_viewerPicture:=<>SVG_viewerPictureBackup
- TRANSFORM PICTURE:C988(<>SVG_viewerPicture; Scale:K61:2; $Num_offset; $Num_offset)
+ TRANSFORM PICTURE:C988(<>SVG_viewerPicture; Scale:K61:2; $offset; $offset)
<>Lon_viewerTimerEvent:=1
SET TIMER:C645(-1)
//…………………………………………………………
- : ($Txt_buffer="automaticallyResize")
+ : ($choice="automaticallyResize")
- $Lon_menu:=Menu selected:C152\65536
- $Lon_line:=Menu selected:C152%65536
- $Txt_mark:=Get menu item mark:C428($Lon_menu; $Lon_line)
+ $selectedMenu:=Menu selected:C152\65536
+ $selectedLine:=Menu selected:C152%65536
+ $mark:=Get menu item mark:C428($selectedMenu; $selectedLine)
- If (Length:C16($Txt_mark)=0)
+ If (Length:C16($mark)=0)
- SET MENU ITEM MARK:C208($Lon_menu; $Lon_line; Char:C90(18))
+ SET MENU ITEM MARK:C208($selectedMenu; $selectedLine; Char:C90(18))
<>automaticallyResize:=True:C214
Else
- SET MENU ITEM MARK:C208($Lon_menu; $Lon_line; "")
+ SET MENU ITEM MARK:C208($selectedMenu; $selectedLine; "")
<>automaticallyResize:=False:C215
End if
//…………………………………………………………
- : ($Txt_buffer="zoomIn")
+ : ($choice="zoomIn")
TRANSFORM PICTURE:C988(<>SVG_viewerPicture; Scale:K61:2; 1.5; 1.5)
<>Lon_viewerTimerEvent:=1
SET TIMER:C645(-1)
//…………………………………………………………
- : ($Txt_buffer="zoomOut")
+ : ($choice="zoomOut")
TRANSFORM PICTURE:C988(<>SVG_viewerPicture; Scale:K61:2; 0.5; 0.5)
<>Lon_viewerTimerEvent:=1
SET TIMER:C645(-1)
//…………………………………………………………
- : ($Txt_buffer="viewPicture")
+ : ($choice="viewPicture")
If (FORM Get current page:C276#1)
@@ -273,7 +240,7 @@ Case of
End if
//…………………………………………………………
- : ($Txt_buffer="viewSource")
+ : ($choice="viewSource")
If (FORM Get current page:C276#2)
@@ -286,27 +253,27 @@ Case of
End if
//…………………………………………………………
- : ($Txt_buffer="recentClear")
+ : ($choice="recentClear")
- For ($Lon_i; Count menu items:C405(<>svg_recentMenuRef); 1; -1)
+ For ($i; Count menu items:C405(<>svg_recentMenuRef); 1; -1)
- DELETE MENU ITEM:C413(<>svg_recentMenuRef; $Lon_i)
+ DELETE MENU ITEM:C413(<>svg_recentMenuRef; $i)
End for
DISABLE MENU ITEM:C150(1; 2)
//…………………………………………………………
- : ($Txt_buffer="recent@")
+ : ($choice="recent@")
- GET MENU ITEM PROPERTY:C972(<>svg_recentMenuRef; Menu selected:C152%65536; "path"; $Txt_Path)
- Viewer_main("menu"; "open_recent"+$Txt_Path)
+ GET MENU ITEM PROPERTY:C972(<>svg_recentMenuRef; Menu selected:C152%65536; "path"; $path)
+ Viewer_main("menu"; "open_recent"+$path)
//…………………………………………………………
End case
//___________________________________________________________
- : ($Txt_entryPoint="_run")
+ : ($action="_run")
//First launch of this method executed in a new process
Viewer_main("_declarations")
@@ -315,179 +282,179 @@ Case of
Viewer_main("_init")
- $Lon_windowRef:=Open form window:C675("viewer"; Plain form window:K39:10+4096; Horizontally centered:K39:1; Vertically centered:K39:4; *)
+ $winRef:=Open form window:C675("viewer"; Plain form window:K39:10+4096; Horizontally centered:K39:1; Vertically centered:K39:4; *)
DIALOG:C40("viewer")
CLOSE WINDOW:C154
PREFERENCES("viewerOptions.set"; -><>showColoredBackground; -><>backgroundColor; -><>automaticallyResize; -><>sourceFontSize)
- ARRAY TEXT:C222($tTxt_Recent; 0x0000)
+ ARRAY TEXT:C222($_recents; 0x0000)
- For ($Lon_i; 1; Count menu items:C405(<>svg_recentMenuRef)-2; 1)
+ For ($i; 1; Count menu items:C405(<>svg_recentMenuRef)-2; 1)
- GET MENU ITEM PROPERTY:C972(<>svg_recentMenuRef; $Lon_i; "path"; $Txt_buffer)
- APPEND TO ARRAY:C911($tTxt_Recent; $Txt_buffer)
+ GET MENU ITEM PROPERTY:C972(<>svg_recentMenuRef; $i; "path"; $t)
+ APPEND TO ARRAY:C911($_recents; $t)
End for
- PREFERENCES("openRecent.set"; ->$tTxt_Recent)
+ PREFERENCES("openRecent.set"; ->$_recents)
Viewer_main("_deinit")
//___________________________________________________________
- : ($Txt_entryPoint="_declarations")
+ : ($action="_declarations")
Compiler_SVG
COMPILER_Not_Thread_Safe
//___________________________________________________________
- : ($Txt_entryPoint="_init")
+ : ($action="_init")
- $Txt_menuBar:=Create menu:C408
+ $menuBar:=Create menu:C408
//++++++++++++++++ FILE
- $Txt_menu:=Create menu:C408
+ $menu:=Create menu:C408
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("CommonOpen")+"…")
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "open")
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "O"; 0)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("CommonOpen")+"…")
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "open")
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "O"; 0)
//================ RECENT
- ARRAY TEXT:C222($tTxt_Recent; 0x0000)
- PREFERENCES("openRecent"; ->$tTxt_Recent)
+ ARRAY TEXT:C222($_recents; 0x0000)
+ PREFERENCES("openRecent"; ->$_recents)
<>svg_recentMenuRef:=Create menu:C408
- For ($Lon_i; 1; Size of array:C274($tTxt_Recent); 1)
+ For ($i; 1; Size of array:C274($_recents); 1)
- APPEND MENU ITEM:C411(<>svg_recentMenuRef; xToolbox_GetLastItemFromPath($tTxt_Recent{$Lon_i}))
- SET MENU ITEM PROPERTY:C973(<>svg_recentMenuRef; -1; "path"; $tTxt_Recent{$Lon_i})
- SET MENU ITEM PARAMETER:C1004(<>svg_recentMenuRef; -1; "recent_"+String:C10($Lon_i))
+ APPEND MENU ITEM:C411(<>svg_recentMenuRef; xToolbox_GetLastItemFromPath($_recents{$i}))
+ SET MENU ITEM PROPERTY:C973(<>svg_recentMenuRef; -1; "path"; $_recents{$i})
+ SET MENU ITEM PARAMETER:C1004(<>svg_recentMenuRef; -1; "recent_"+String:C10($i))
End for
- If (Size of array:C274($tTxt_Recent)>0)
+ If (Size of array:C274($_recents)>0)
APPEND MENU ITEM:C411(<>svg_recentMenuRef; "-")
- APPEND MENU ITEM:C411(<>svg_recentMenuRef; Get localized string:C991("clearMenu"))
+ APPEND MENU ITEM:C411(<>svg_recentMenuRef; Localized string:C991("clearMenu"))
SET MENU ITEM PARAMETER:C1004(<>svg_recentMenuRef; -1; "recentClear")
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("openRecent"); <>svg_recentMenuRef)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("openRecent"); <>svg_recentMenuRef)
Else
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("openRecent"); <>svg_recentMenuRef)
- DISABLE MENU ITEM:C150($Txt_menu; -1)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("openRecent"); <>svg_recentMenuRef)
+ DISABLE MENU ITEM:C150($menu; -1)
End if
- APPEND MENU ITEM:C411($Txt_menu; "-")
+ APPEND MENU ITEM:C411($menu; "-")
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("CommonClose"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "close")
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "W"; 0)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("CommonClose"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "close")
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "W"; 0)
- APPEND MENU ITEM:C411($Txt_menu; "-")
+ APPEND MENU ITEM:C411($menu; "-")
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("CommonSaveDial"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "save")
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "S"; 0)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("CommonSaveDial"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "save")
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "S"; 0)
- APPEND MENU ITEM:C411($Txt_menuBar; Get localized string:C991("CommonMenuFile"); $Txt_menu)
+ APPEND MENU ITEM:C411($menuBar; Localized string:C991("CommonMenuFile"); $menu)
//++++++++++++++++ EDIT
- $Txt_menu:=Create menu:C408
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("CommonMenuItemUndo"))
- SET MENU ITEM PROPERTY:C973($Txt_menu; -1; Associated standard action name:K28:8; _o_Undo action:K59:16)
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "Z"; 0)
+ $menu:=Create menu:C408
+ APPEND MENU ITEM:C411($menu; Localized string:C991("CommonMenuItemUndo"))
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action name:K28:8; _o_Undo action:K59:16)
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "Z"; 0)
- APPEND MENU ITEM:C411($Txt_menu; "-")
+ APPEND MENU ITEM:C411($menu; "-")
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("CommonMenuItemCut"))
+ APPEND MENU ITEM:C411($menu; Localized string:C991("CommonMenuItemCut"))
- DISABLE MENU ITEM:C150($Txt_menu; -1)
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "X"; 0)
+ DISABLE MENU ITEM:C150($menu; -1)
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "X"; 0)
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("CommonMenuItemCopy"))
- SET MENU ITEM PROPERTY:C973($Txt_menu; -1; Associated standard action name:K28:8; _o_Copy action:K59:19)
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "C"; 0)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("CommonMenuItemCopy"))
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action name:K28:8; _o_Copy action:K59:19)
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "C"; 0)
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("CommonMenuItemPaste"))
- SET MENU ITEM PROPERTY:C973($Txt_menu; -1; Associated standard action name:K28:8; _o_Paste action:K59:20)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("CommonMenuItemPaste"))
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action name:K28:8; _o_Paste action:K59:20)
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "V"; 0)
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "V"; 0)
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("CommonMenuItemClear"))
+ APPEND MENU ITEM:C411($menu; Localized string:C991("CommonMenuItemClear"))
- DISABLE MENU ITEM:C150($Txt_menu; -1)
+ DISABLE MENU ITEM:C150($menu; -1)
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("CommonMenuItemSelectAll"))
- SET MENU ITEM PROPERTY:C973($Txt_menu; -1; Associated standard action name:K28:8; _o_Select all action:K59:22)
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "A"; 0)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("CommonMenuItemSelectAll"))
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action name:K28:8; _o_Select all action:K59:22)
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "A"; 0)
- APPEND MENU ITEM:C411($Txt_menu; "-")
+ APPEND MENU ITEM:C411($menu; "-")
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("CommonMenuItemShowClipboard"))
- SET MENU ITEM PROPERTY:C973($Txt_menu; -1; Associated standard action name:K28:8; _o_Show clipboard action:K59:23)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("CommonMenuItemShowClipboard"))
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action name:K28:8; _o_Show clipboard action:K59:23)
- APPEND MENU ITEM:C411($Txt_menuBar; Get localized string:C991("CommonMenuEdit"); $Txt_menu)
+ APPEND MENU ITEM:C411($menuBar; Localized string:C991("CommonMenuEdit"); $menu)
//++++++++++++++++ VIEW
- $Txt_menu:=Create menu:C408
+ $menu:=Create menu:C408
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("showColoredBackground"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "showColoredBackground")
+ APPEND MENU ITEM:C411($menu; Localized string:C991("showColoredBackground"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "showColoredBackground")
If (<>showColoredBackground)
- SET MENU ITEM MARK:C208($Txt_menu; -1; Char:C90(18))
+ SET MENU ITEM MARK:C208($menu; -1; Char:C90(18))
End if
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("backgroundColor"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "backgroundColor")
+ APPEND MENU ITEM:C411($menu; Localized string:C991("backgroundColor"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "backgroundColor")
- APPEND MENU ITEM:C411($Txt_menu; "-")
+ APPEND MENU ITEM:C411($menu; "-")
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("actualSize"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "actualSize")
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "="; 0)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("actualSize"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "actualSize")
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "="; 0)
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("zoomToFit"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "zoomToFit")
+ APPEND MENU ITEM:C411($menu; Localized string:C991("zoomToFit"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "zoomToFit")
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("automaticallyResize"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "automaticallyResize")
+ APPEND MENU ITEM:C411($menu; Localized string:C991("automaticallyResize"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "automaticallyResize")
If (<>automaticallyResize)
- SET MENU ITEM MARK:C208($Txt_menu; -1; Char:C90(18))
+ SET MENU ITEM MARK:C208($menu; -1; Char:C90(18))
End if
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("zoomIn"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "zoomIn")
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "+"; 0)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("zoomIn"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "zoomIn")
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "+"; 0)
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("zoomOut"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "zoomOut")
- SET MENU ITEM SHORTCUT:C423($Txt_menu; -1; "-"; 0)
+ APPEND MENU ITEM:C411($menu; Localized string:C991("zoomOut"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "zoomOut")
+ SET MENU ITEM SHORTCUT:C423($menu; -1; "-"; 0)
- APPEND MENU ITEM:C411($Txt_menu; "-")
+ APPEND MENU ITEM:C411($menu; "-")
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("picture"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "viewPicture")
- SET MENU ITEM MARK:C208($Txt_menu; -1; Char:C90(18))
+ APPEND MENU ITEM:C411($menu; Localized string:C991("picture"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "viewPicture")
+ SET MENU ITEM MARK:C208($menu; -1; Char:C90(18))
- APPEND MENU ITEM:C411($Txt_menu; Get localized string:C991("source"))
- SET MENU ITEM PARAMETER:C1004($Txt_menu; -1; "viewSource")
+ APPEND MENU ITEM:C411($menu; Localized string:C991("source"))
+ SET MENU ITEM PARAMETER:C1004($menu; -1; "viewSource")
- APPEND MENU ITEM:C411($Txt_menuBar; Get localized string:C991("menuView"); $Txt_menu)
+ APPEND MENU ITEM:C411($menuBar; Localized string:C991("menuView"); $menu)
- SET MENU BAR:C67($Txt_menuBar)
+ SET MENU BAR:C67($menuBar)
//___________________________________________________________
- : ($Txt_entryPoint="_deinit")
+ : ($action="_deinit")
//CLEAR LIST(<>Lon_tabID;*)
xToolBox_RELEASE_MENU(Get menu bar reference:C979)
diff --git a/Project/Sources/Methods/fallBack_Not_thread_safe.4dm b/Project/Sources/Methods/fallBack_Not_thread_safe.4dm
index bca2241..81dc3f4 100644
--- a/Project/Sources/Methods/fallBack_Not_thread_safe.4dm
+++ b/Project/Sources/Methods/fallBack_Not_thread_safe.4dm
@@ -1,44 +1,37 @@
//%attributes = {"invisible":true,"preemptive":"incapable"}
-C_OBJECT:C1216($1)
+#DECLARE($properties : Object)
-C_TEXT:C284($Txt_property)
+var $property : Text
-If (False:C215)
- C_OBJECT:C1216(fallBack_Not_thread_safe ;$1)
-End if
-
-For each ($Txt_property;$1)
+For each ($property; $properties)
Case of
- //______________________________________________________
- : ($Txt_property="set")
+ //______________________________________________________
+ : ($property="set")
- <>Ptr_Document:=$1[$Txt_property]
+ <>Ptr_Document:=$properties[$property]
Use (Storage:C1525.svg)
If (Is nil pointer:C315(<>Ptr_Document))
- // Decrement usage
+ // Decrement usage
Storage:C1525.svg.variableDocument:=Storage:C1525.svg.variableDocument-1
Else
- // Increment usage
+ // Increment usage
Storage:C1525.svg.variableDocument:=Num:C11(Storage:C1525.svg.variableDocument)+1
End if
End use
- //______________________________________________________
- : ($Txt_property="document")
-
- <>Ptr_Document->:=$1[$Txt_property]
+ //______________________________________________________
+ : ($property="document")
- //______________________________________________________
- Else
+ <>Ptr_Document->:=$properties[$property]
- //______________________________________________________
+ //______________________________________________________
End case
End for each
\ No newline at end of file
diff --git a/Project/Sources/Methods/svg_relativeURL.4dm b/Project/Sources/Methods/svg_relativeURL.4dm
index fedb749..bfa575b 100644
--- a/Project/Sources/Methods/svg_relativeURL.4dm
+++ b/Project/Sources/Methods/svg_relativeURL.4dm
@@ -1,97 +1,70 @@
//%attributes = {"invisible":true,"preemptive":"capable"}
- // ----------------------------------------------------
- // Project method : svg_relativeURL
- // Database: 4D SVG
- // ID[CA4B53BAC56A4530BF2B9BF2D31BEB01]
- // Created 28-2-2013 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description:
- // Relative URL doesn't begin with sheme name and doesn't contains doamin name.
- // L'URL :
- // {/} base = Resources/SVG/
- // ./ base = Resources/
- // ../ base = database folder
- // ----------------------------------------------------
- // Declarations
-C_TEXT:C284($0)
-C_POINTER:C301($1)
+// ----------------------------------------------------
+// Project method : svg_relativeURL
+// Database: 4D SVG
+// ID[CA4B53BAC56A4530BF2B9BF2D31BEB01]
+// Created 28-2-2013 by Vincent de Lachaux
+// ----------------------------------------------------
+// Description:
+// Relative URL doesn't begin with sheme name and doesn't contains doamin name.
+// L'URL :
+// {/} base = Resources/SVG/
+// ./ base = Resources/
+// ../ base = database folder
+// ----------------------------------------------------
+#DECLARE($esultPtr : Pointer) : Text
-C_LONGINT:C283($Lon_parameters)
-C_TEXT:C284($Txt_path;$Txt_resourcesPath;$Txt_URL)
+var $path; $resourcesPath; $url : Text
-If (False:C215)
- C_TEXT:C284(svg_relativeURL ;$0)
- C_POINTER:C301(svg_relativeURL ;$1)
-End if
+$url:=$esultPtr->
+$resourcesPath:=Get 4D folder:C485(Current resources folder:K5:16; *)
- // ----------------------------------------------------
- // Initialisations
-$Lon_parameters:=Count parameters:C259
-
-If (Asserted:C1132($Lon_parameters>=1;"Missing parameter"))
-
- $Txt_URL:=$1->
-
- $Txt_resourcesPath:=Get 4D folder:C485(Current resources folder:K5:16;*)
-
-Else
-
- ABORT:C156
-
-End if
-
- // ----------------------------------------------------
Case of
- //______________________________________________________
- : ($Txt_URL="../@") // base = database folder
+ //______________________________________________________
+ : ($url="../@") // Base = database folder
- $Txt_URL:=Delete string:C232($Txt_URL;1;3)
+ $url:=Delete string:C232($url; 1; 3)
- $Txt_path:=Get 4D folder:C485(Database folder:K5:14)\
- +Replace string:C233($Txt_URL;"/";Folder separator:K24:12)
+ $path:=Get 4D folder:C485(Database folder:K5:14)\
+ +Replace string:C233($url; "/"; Folder separator:K24:12)
- $Txt_URL:="../../"+$Txt_URL
+ $url:="../../"+$url
- //______________________________________________________
- : ($Txt_URL="/@") // base = ~/Resources/SVG/
+ //______________________________________________________
+ : ($url="/@") // Base = ~/Resources/SVG/
- //be sure the folder SVG is present in the folder Resources
- CREATE FOLDER:C475($Txt_resourcesPath+"SVG"+Folder separator:K24:12;*)
+ // Be sure the folder SVG is present in the folder Resources
+ CREATE FOLDER:C475($resourcesPath+"SVG"+Folder separator:K24:12; *)
- $Txt_URL:=Delete string:C232($Txt_URL;1;1)
+ $url:=Delete string:C232($url; 1; 1)
- $Txt_path:=$Txt_resourcesPath+"SVG"+Folder separator:K24:12\
- +Replace string:C233($Txt_URL;"/";Folder separator:K24:12)
+ $path:=$resourcesPath+"SVG"+Folder separator:K24:12\
+ +Replace string:C233($url; "/"; Folder separator:K24:12)
- //______________________________________________________
- : ($Txt_URL="./@") // base = ~/Resources/
+ //______________________________________________________
+ : ($url="./@") // Base = ~/Resources/
- $Txt_URL:=Delete string:C232($Txt_URL;1;2)
+ $url:=Delete string:C232($url; 1; 2)
- $Txt_path:=$Txt_resourcesPath\
- +Replace string:C233($Txt_URL;"/";Folder separator:K24:12)
+ $path:=$resourcesPath\
+ +Replace string:C233($url; "/"; Folder separator:K24:12)
- $Txt_URL:="../"+$Txt_URL
+ $url:="../"+$url
- //______________________________________________________
+ //______________________________________________________
Else
- $Txt_path:=$Txt_resourcesPath+"SVG"+Folder separator:K24:12\
- +Replace string:C233($Txt_URL;"/";Folder separator:K24:12)
+ $path:=$resourcesPath+"SVG"+Folder separator:K24:12\
+ +Replace string:C233($url; "/"; Folder separator:K24:12)
- //______________________________________________________
+ //______________________________________________________
End case
- // ----------------------------------------------------
- // Return
-
-If (Test path name:C476($Txt_path)=Is a document:K24:1)
+If (Test path name:C476($path)=Is a document:K24:1)
- $0:=$Txt_path
- $1->:=url_encode ($Txt_URL)
+ $esultPtr->:=url_encode($url)
-End if
-
- // ----------------------------------------------------
- // End
\ No newline at end of file
+ return $path
+
+End if
\ No newline at end of file
diff --git a/Project/Sources/Methods/syntax_EXPAND.4dm b/Project/Sources/Methods/syntax_EXPAND.4dm
index 0a282fd..b8cd39d 100644
--- a/Project/Sources/Methods/syntax_EXPAND.4dm
+++ b/Project/Sources/Methods/syntax_EXPAND.4dm
@@ -1,72 +1,48 @@
//%attributes = {"invisible":true,"preemptive":"incapable"}
- // ----------------------------------------------------
- // Project method : syntax_EXPAND
- // Database: 4D SVG
- // ID[3A7EDAFE4C014393BF97BBD93C908804]
- // Created #23-5-2013 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description:
- //
- // ----------------------------------------------------
- // Declarations
-C_BOOLEAN:C305($1)
+// ----------------------------------------------------
+// Project method : syntax_EXPAND
+// Database: 4D SVG
+// ID[3A7EDAFE4C014393BF97BBD93C908804]
+// Created #23-5-2013 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($expand : Boolean)
-C_LONGINT:C283($bottom;$height;$l;$left;$Lon_parameters;$Lon_windowRef)
-C_LONGINT:C283($right;$top;$width)
+var $bottom; $height; $l; $left; $right; $top : Integer
+var $width; $windowRef : Integer
-If (False:C215)
- C_BOOLEAN:C305(syntax_EXPAND ;$1)
-End if
-
- // ----------------------------------------------------
- // Initialisations
-$Lon_parameters:=Count parameters:C259
+// NO PARAMETERS REQUIRED
+$windowRef:=Current form window:C827
-If (Asserted:C1132($Lon_parameters>=0;"Missing parameter"))
+If (Count parameters:C259>=1)
- // NO PARAMETERS REQUIRED
- $Lon_windowRef:=Current form window:C827
-
- If ($Lon_parameters>=1)
-
- $l:=Num:C11($1)
- (OBJECT Get pointer:C1124(Object named:K67:5;"collapse_expand"))->:=$l
-
- Else
-
- $l:=(OBJECT Get pointer:C1124(Object named:K67:5;"collapse_expand"))->
-
- End if
+ $l:=Num:C11($expand)
+ (OBJECT Get pointer:C1124(Object named:K67:5; "collapse_expand"))->:=$l
Else
- ABORT:C156
+ $l:=(OBJECT Get pointer:C1124(Object named:K67:5; "collapse_expand"))->
End if
- // ----------------------------------------------------
If ($l=1) // Expand
- OBJECT GET COORDINATES:C663(*;"help";$left;$top;$right;$bottom)
+ OBJECT GET COORDINATES:C663(*; "help"; $left; $top; $right; $bottom)
$width:=$right
FORM SET HORIZONTAL RESIZING:C892(True:C214)
- WA OPEN URL:C1020(*;"help";"about:blank")
+ WA OPEN URL:C1020(*; "help"; "about:blank")
<>Lon_timerEvent:=10
SET TIMER:C645(-1)
Else // Collapse
- FORM GET PROPERTIES:C674("syntaxPalette";$width;$height)
+ FORM GET PROPERTIES:C674("syntaxPalette"; $width; $height)
FORM SET HORIZONTAL RESIZING:C892(False:C215)
End if
-GET WINDOW RECT:C443($left;$top;$right;$bottom;$Lon_windowRef)
-SET WINDOW RECT:C444($left;$top;$left+$width;$bottom;$Lon_windowRef)
-
- // ----------------------------------------------------
- // End
\ No newline at end of file
+GET WINDOW RECT:C443($left; $top; $right; $bottom; $windowRef)
+SET WINDOW RECT:C444($left; $top; $left+$width; $bottom; $windowRef)
\ No newline at end of file
diff --git a/Project/Sources/Methods/syntax_List.4dm b/Project/Sources/Methods/syntax_List.4dm
index 5f798f3..b562023 100644
--- a/Project/Sources/Methods/syntax_List.4dm
+++ b/Project/Sources/Methods/syntax_List.4dm
@@ -1,104 +1,78 @@
//%attributes = {"invisible":true}
- // ----------------------------------------------------
- // Project method : syntax_List
- // Database: 4D SVG
- // ID[57E1469DC7E14BD1B76BFF65ADC82BAB]
- // Created #23-5-2013 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description:
- //
- // ----------------------------------------------------
- // Declarations
-C_LONGINT:C283($0)
+// ----------------------------------------------------
+// Project method : syntax_List
+// Database: 4D SVG
+// ID[57E1469DC7E14BD1B76BFF65ADC82BAB]
+// Created #23-5-2013 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE() : Integer
-C_LONGINT:C283($Lon_count;$Lon_i;$Lon_parameters;$Lon_x;$Lst_command;$Lst_syntax)
-C_TEXT:C284($Dom_node;$Dom_root;$File_rsrc;$Txt_buffer)
+var $node; $pathname; $root; $t : Text
+var $commands; $i; $id; $list; $Lon_parameters; $size : Integer
-ARRAY TEXT:C222($tDom_nodes;0)
+ARRAY TEXT:C222($_nodes; 0)
-If (False:C215)
- C_LONGINT:C283(syntax_List ;$0)
-End if
-
- // ----------------------------------------------------
- // Initialisations
-$Lon_parameters:=Count parameters:C259
-
-If (Asserted:C1132($Lon_parameters>=0;"Missing parameter"))
-
- //NO PARAMETERS REQUIRED
-
- $File_rsrc:=Get localized document path:C1105("4DPop.xlf")
-
-Else
-
- ABORT:C156
-
-End if
+$pathname:=Localized document path:C1105("4DPop.xlf")
- // ----------------------------------------------------
-If (Asserted:C1132(Test path name:C476($File_rsrc)=Is a document:K24:1))
+If (Asserted:C1132(Test path name:C476($pathname)=Is a document:K24:1))
- $Dom_root:=DOM Parse XML source:C719($File_rsrc)
+ $root:=DOM Parse XML source:C719($pathname)
If (OK=1)
- $Dom_node:=DOM Find XML element by ID:C1010($Dom_root;"commands")
+ $node:=DOM Find XML element by ID:C1010($root; "commands")
If (OK=1)
- $tDom_nodes{0}:=DOM Find XML element:C864($Dom_node;"group/trans-unit";$tDom_nodes)
- $Lon_count:=Size of array:C274($tDom_nodes)
+ $_nodes{0}:=DOM Find XML element:C864($node; "group/trans-unit"; $_nodes)
+ $size:=Size of array:C274($_nodes)
- ARRAY TEXT:C222($tTxt_names;$Lon_count)
- ARRAY TEXT:C222($tTxt_theme;$Lon_count)
- ARRAY LONGINT:C221($tLon_command;$Lon_count)
+ ARRAY TEXT:C222($tTxt_names; $size)
+ ARRAY TEXT:C222($tTxt_theme; $size)
+ ARRAY LONGINT:C221($tLon_command; $size)
- For ($Lon_i;1;$Lon_count;1)
+ For ($i; 1; $size; 1)
- DOM GET XML ATTRIBUTE BY NAME:C728($tDom_nodes{$Lon_i};"extradata";$tTxt_theme{$Lon_i})
- DOM GET XML ATTRIBUTE BY NAME:C728($tDom_nodes{$Lon_i};"resname";$tTxt_names{$Lon_i})
- DOM GET XML ATTRIBUTE BY NAME:C728($tDom_nodes{$Lon_i};"help-id";$tLon_command{$Lon_i})
+ DOM GET XML ATTRIBUTE BY NAME:C728($_nodes{$i}; "extradata"; $tTxt_theme{$i})
+ DOM GET XML ATTRIBUTE BY NAME:C728($_nodes{$i}; "resname"; $tTxt_names{$i})
+ DOM GET XML ATTRIBUTE BY NAME:C728($_nodes{$i}; "help-id"; $tLon_command{$i})
End for
End if
- SORT ARRAY:C229($tTxt_theme;$tTxt_names;$tLon_command)
+ SORT ARRAY:C229($tTxt_theme; $tTxt_names; $tLon_command)
- $Lst_syntax:=New list:C375
+ $list:=New list:C375
- For ($Lon_i;1;$Lon_count;1)
+ For ($i; 1; $size; 1)
- If ($tTxt_theme{$Lon_i}#$tTxt_theme{0}) //new theme
+ If ($tTxt_theme{$i}#$tTxt_theme{0}) //new theme
- $tTxt_theme{0}:=$tTxt_theme{$Lon_i}
- $Txt_buffer:=$tTxt_theme{0}
+ $tTxt_theme{0}:=$tTxt_theme{$i}
+ $t:=$tTxt_theme{0}
- $Dom_node:=DOM Find XML element by ID:C1010($Dom_root;$Txt_buffer)
+ $node:=DOM Find XML element by ID:C1010($root; $t)
If (OK=1)
- DOM GET XML ATTRIBUTE BY NAME:C728($Dom_node;"help-id";$Lon_x)
+ DOM GET XML ATTRIBUTE BY NAME:C728($node; "help-id"; $id)
- $Lst_command:=New list:C375
- APPEND TO LIST:C376($Lst_syntax;Get localized string:C991($Txt_buffer);$Lon_x;$Lst_command;False:C215)
- SET LIST ITEM PROPERTIES:C386($Lst_syntax;$Lon_x;False:C215;Bold:K14:2;0)
+ $commands:=New list:C375
+ APPEND TO LIST:C376($list; Localized string:C991($t); $id; $commands; False:C215)
+ SET LIST ITEM PROPERTIES:C386($list; $id; False:C215; Bold:K14:2; 0)
End if
End if
- APPEND TO LIST:C376($Lst_command;$tTxt_names{$Lon_i};Choose:C955($tLon_command{$Lon_i}#0;$tLon_command{$Lon_i};$Lon_x))
+ APPEND TO LIST:C376($commands; $tTxt_names{$i}; Choose:C955($tLon_command{$i}#0; $tLon_command{$i}; $id))
End for
- DOM CLOSE XML:C722($Dom_root)
+ DOM CLOSE XML:C722($root)
- SORT LIST:C391($Lst_syntax)
+ SORT LIST:C391($list)
End if
End if
-$0:=$Lst_syntax
-
- // ----------------------------------------------------
- // End
\ No newline at end of file
+return $list
\ No newline at end of file
diff --git a/Project/Sources/Methods/testCallbackMethod.4dm b/Project/Sources/Methods/testCallbackMethod.4dm
index 5d07c5e..a9aa0ea 100644
--- a/Project/Sources/Methods/testCallbackMethod.4dm
+++ b/Project/Sources/Methods/testCallbackMethod.4dm
@@ -1,29 +1,16 @@
//%attributes = {"invisible":true}
// ----------------------------------------------------
-// Method : testCallbackMethod
+// Method : testCallbackMethod
// Created 21/06/10 by Vincent de Lachaux
// ----------------------------------------------------
-// Description
-//
-// ----------------------------------------------------
-// Declarations
-//C_ENTIER LONG($1)
-C_TEXT:C284($1)
-
-C_LONGINT:C283($Lon_event; $Lon_i)
-C_TEXT:C284($kTxt_picture; $Txt_ID)
+#DECLARE($Txt_ID : Text)
-If (False:C215)
- C_TEXT:C284(testCallbackMethod; $1)
-End if
+var $kTxt_picture : Text
+var $Lon_event; $Lon_i : Integer
-// ----------------------------------------------------
-// Initialisations
-$Txt_ID:=$1
$Lon_event:=Form event code:C388
$kTxt_picture:="viewerPicture"
-// ----------------------------------------------------
Case of
@@ -32,28 +19,31 @@ Case of
For ($Lon_i; 1; 3; 1)
- SVG SET ATTRIBUTE:C1055(*; $kTxt_picture; "rec_"+String:C10($Lon_i); "stroke"; "inherit")
+ SVG SET ATTRIBUTE:C1055(*; $kTxt_picture; "rec_"+String:C10($Lon_i); \
+ "stroke"; "inherit")
End for
//_________________________________
+
: ($Lon_event=On Mouse Move:K2:35)
- //Boucle ($Lon_i;1;3;1)
+ // Boucle ($Lon_i;1;3;1)
//
- //SVG FIXER ATTRIBUT(*;$kTxt_picture;"rec_"+Chaine($Lon_i);"stroke";"inherit")
+ // SVG FIXER ATTRIBUT(*;$kTxt_picture;"rec_"+Chaine($Lon_i);"stroke";"inherit")
//
- //Fin de boucle
+ // Fin de boucle
//
- //SVG FIXER ATTRIBUT(*;$kTxt_picture;$Txt_ID;"stroke";"red")
+ // SVG FIXER ATTRIBUT(*;$kTxt_picture;$Txt_ID;"stroke";"red")
//_________________________________
: ($Lon_event=On Clicked:K2:4)
- //ALERTE("id: "+$Txt_ID)
+ // ALERTE("id: "+$Txt_ID)
- SVG SET ATTRIBUTE:C1055(*; $kTxt_picture; $Txt_ID; "filter"; "#Shadow")
+ SVG SET ATTRIBUTE:C1055(*; $kTxt_picture; $Txt_ID; \
+ "filter"; "#Shadow")
- //SVG FIXER ATTRIBUT(*;$kTxt_picture;$Txt_ID;"class";"selected")
+ // SVG FIXER ATTRIBUT(*;$kTxt_picture;$Txt_ID;"class";"selected")
//_________________________________
End case
\ No newline at end of file
diff --git a/Project/Sources/Methods/url_decode.4dm b/Project/Sources/Methods/url_decode.4dm
index 415b5f3..28e0c31 100644
--- a/Project/Sources/Methods/url_decode.4dm
+++ b/Project/Sources/Methods/url_decode.4dm
@@ -1,79 +1,33 @@
//%attributes = {"invisible":true,"preemptive":"capable"}
- // Project method : url_decode
- // Database: 4D SVG
- // ID[F809B62087CC4EB6948898955BA27279]
- // Created 28-2-2013 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description:
- //
- // ----------------------------------------------------
- // Declarations
-C_TEXT:C284($0)
-C_TEXT:C284($1)
+// Project method : url_decode
+// Database: 4D SVG
+// ID[F809B62087CC4EB6948898955BA27279]
+// Created 28-2-2013 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($url : Text) : Text
-C_LONGINT:C283($Lon_charCode;$Lon_i;$Lon_parameters)
-C_TEXT:C284($Txt_decoded;$Txt_hexValues;$Txt_url)
+var $decoded; $HEX : Text
+var $charCode; $i : Integer
-If (False:C215)
- C_TEXT:C284(url_decode ;$0)
- C_TEXT:C284(url_decode ;$1)
-End if
+// #28-10-2014 - XSL transformation is no longer supported
+$HEX:="123456789ABCDEF"
- // ----------------------------------------------------
- // Initialisations
-$Lon_parameters:=Count parameters:C259
-
-If (Asserted:C1132($Lon_parameters>=1;"Missing parameter"))
-
- $Txt_url:=$1
-
- // #28-10-2014 - XSL transformation is no longer supported
- $Txt_hexValues:="123456789ABCDEF"
-
-Else
-
- ABORT:C156
+For ($i; 1; Length:C16($url); 1)
-End if
-
- // ----------------------------------------------------
- //$Dom_root:=DOM Create XML Ref("string-to-decode")
- //DOM SET XML ELEMENT VALUE($Dom_root;"string-to-decode";$Txt_url)
- //DOM EXPORT TO VAR($Dom_root;$Blb_source)
- //DOM CLOSE XML($Dom_root)
- //$Txt_sheet:=""
- //$Txt_sheet:=$Txt_sheet+""
- //$Txt_sheet:=$Txt_sheet+" "
- //$Txt_sheet:=$Txt_sheet+" "
- //$Txt_sheet:=$Txt_sheet+" "
- //$Txt_sheet:=$Txt_sheet+" "
- //$Txt_sheet:=$Txt_sheet+""
- //CONVERT FROM TEXT($Txt_sheet;"utf-8";$Blb_sheet)
- //_o_XSLT APPLY TRANSFORMATION($Blb_source;$Blb_sheet;$Blb_result)
- //$0:=Convert to text($Blb_result;"utf-8")
-
-For ($Lon_i;1;Length:C16($Txt_url);1)
-
- If ($Txt_url[[$Lon_i]]="%")
+ If ($url[[$i]]="%")
- $Lon_charCode:=(Position:C15(Substring:C12($Txt_url;$Lon_i+1;1);$Txt_hexValues)*16)\
- +(Position:C15(Substring:C12($Txt_url;$Lon_i+2;1);$Txt_hexValues))
+ $charCode:=(Position:C15(Substring:C12($url; $i+1; 1); $HEX)*16)\
+ +(Position:C15(Substring:C12($url; $i+2; 1); $HEX))
- $Txt_decoded:=$Txt_decoded+Char:C90($Lon_charCode)
+ $decoded:=$decoded+Char:C90($charCode)
- $Lon_i:=$Lon_i+2
+ $i:=$i+2
Else
- $Txt_decoded:=$Txt_decoded+$Txt_url[[$Lon_i]]
+ $decoded:=$decoded+$url[[$i]]
End if
End for
-$0:=$Txt_decoded
-
- // ----------------------------------------------------
- // Return
-
- // ----------------------------------------------------
- // End
\ No newline at end of file
+return $decoded
\ No newline at end of file
diff --git a/Project/Sources/Methods/url_encode.4dm b/Project/Sources/Methods/url_encode.4dm
index 6a235ea..851a54a 100644
--- a/Project/Sources/Methods/url_encode.4dm
+++ b/Project/Sources/Methods/url_encode.4dm
@@ -1,89 +1,43 @@
//%attributes = {"invisible":true,"preemptive":"capable"}
- // ----------------------------------------------------
- // Project method : url_encode
- // Database: 4D SVG
- // ID[447F725AD64A4C57AA33541AAAF4F3A9]
- // Created 28-2-2013 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description:
- //
- // ----------------------------------------------------
- // Declarations
-C_TEXT:C284($0)
-C_TEXT:C284($1)
+// ----------------------------------------------------
+// Project method : url_encode
+// Database: 4D SVG
+// ID[447F725AD64A4C57AA33541AAAF4F3A9]
+// Created 28-2-2013 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($url : Text) : Text
-C_LONGINT:C283($Lon_charCode;$Lon_i;$Lon_length;$Lon_parameters)
-C_TEXT:C284($Txt_encoded;$Txt_url;$Txt_validCharacters)
+var $encoded; $VALID : Text
+var $charCode; $i; $length : Integer
-If (False:C215)
- C_TEXT:C284(url_encode ;$0)
- C_TEXT:C284(url_encode ;$1)
-End if
+// #28-10-2014 - XSL transformation is no longer supported
+// Fill an array with the characters which need no conversion
+$VALID:="1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz:/.?=_-$(){}~&"
+$length:=Length:C16($VALID)
+ARRAY LONGINT:C221($safe; $length)
- // ----------------------------------------------------
- // Initialisations
-$Lon_parameters:=Count parameters:C259
-
-If (Asserted:C1132($Lon_parameters>=1;"Missing parameter"))
-
- $Txt_url:=$1
-
- // #28-10-2014 - XSL transformation is no longer supported
- // Fill an array with the characters which need no conversion
- $Txt_validCharacters:="1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz:/.?=_-$(){}~&"
- $Lon_length:=Length:C16($Txt_validCharacters)
- ARRAY LONGINT:C221($tLon_safeCharacters;$Lon_length)
-
- For ($Lon_i;1;$Lon_length;1)
-
- $tLon_safeCharacters{$Lon_i}:=Character code:C91($Txt_validCharacters[[$Lon_i]])
-
- End for
-
-Else
+For ($i; 1; $length; 1)
- ABORT:C156
+ $safe{$i}:=Character code:C91($VALID[[$i]])
-End if
-
- // ----------------------------------------------------
- //$Dom_root:=DOM Create XML Ref("string-to-encode")
- //DOM SET XML ELEMENT VALUE($Dom_root;"string-to-encode";$Txt_url)
- //DOM EXPORT TO VAR($Dom_root;$Blb_source)
- //DOM CLOSE XML($Dom_root)
- //$Txt_sheet:=""
- //$Txt_sheet:=$Txt_sheet+""
- //$Txt_sheet:=$Txt_sheet+" "
- //$Txt_sheet:=$Txt_sheet+" "
- //$Txt_sheet:=$Txt_sheet+" "
- //$Txt_sheet:=$Txt_sheet+" "
- //$Txt_sheet:=$Txt_sheet+" "
- //$Txt_sheet:=$Txt_sheet+""
- //CONVERT FROM TEXT($Txt_sheet;"utf-8";$Blb_sheet)
- //_o_XSLT APPLY TRANSFORMATION($Blb_source;$Blb_sheet;$Blb_result)
- //$0:=Convert to text($Blb_result;"utf-8")
+End for
- // Convert the characters
-For ($Lon_i;1;Length:C16($Txt_url);1)
+// Convert the characters
+For ($i; 1; Length:C16($url); 1)
- $Lon_charCode:=Character code:C91($Txt_url[[$Lon_i]])
+ $charCode:=Character code:C91($url[[$i]])
- If (Find in array:C230($tLon_safeCharacters;$Lon_charCode)#-1)
+ If (Find in array:C230($safe; $charCode)#-1)
- // Safe character, append unaltered
- $Txt_encoded:=$Txt_encoded+Char:C90($Lon_charCode)
+ // Safe character, append unaltered
+ $encoded:=$encoded+Char:C90($charCode)
Else
- // Unsafe character, append as a hex string
- $Txt_encoded:=$Txt_encoded+"%"+Substring:C12(String:C10($Lon_charCode;"&x");5)
+ // Unsafe character, append as a hex string
+ $encoded:=$encoded+"%"+Substring:C12(String:C10($charCode; "&x"); 5)
End if
End for
- // ----------------------------------------------------
- // Return
-$0:=$Txt_encoded
-
- // ----------------------------------------------------
- // End
\ No newline at end of file
+return $encoded
\ No newline at end of file
diff --git a/Project/Sources/Methods/viewer_sources.4dm b/Project/Sources/Methods/viewer_sources.4dm
index f857e51..036de34 100644
--- a/Project/Sources/Methods/viewer_sources.4dm
+++ b/Project/Sources/Methods/viewer_sources.4dm
@@ -1,63 +1,31 @@
//%attributes = {"invisible":true}
- // ----------------------------------------------------
- // Project method : viewer_sources
- // Database: 4D SVG
- // ID[B2753247FA10434DB463ECDA4C0B981C]
- // Created #15-5-2013 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description:
- //
- // ----------------------------------------------------
- // Declarations
-C_TEXT:C284($0)
-C_TEXT:C284($1)
+// ----------------------------------------------------
+// Project method : viewer_sources
+// Database: 4D SVG
+// ID[B2753247FA10434DB463ECDA4C0B981C]
+// Created #15-5-2013 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($sources : Text) : Text
-C_LONGINT:C283($Lon_parameters)
-C_TEXT:C284($Txt_sources)
-
-If (False:C215)
- C_TEXT:C284(viewer_sources ;$0)
- C_TEXT:C284(viewer_sources ;$1)
-End if
-
- // ----------------------------------------------------
- // Initialisations
-$Lon_parameters:=Count parameters:C259
-
-If (Asserted:C1132($Lon_parameters>=1;"Missing parameter"))
-
- $Txt_sources:=$1
-
-Else
-
- ABORT:C156
-
-End if
-
- // ----------------------------------------------------
Case of
- //______________________________________________________
- : (Length:C16($Txt_sources)=0)\
- | (Length:C16($Txt_sources)>MAXTEXTLENBEFOREV11:K35:3)
+ //______________________________________________________
+ : (Length:C16($sources)=0)\
+ | (Length:C16($sources)>MAXTEXTLENBEFOREV11:K35:3)
- //______________________________________________________
- : (Position:C15("xmlns:sodipodi";$Txt_sources)>0)
+ //______________________________________________________
+ : (Position:C15("xmlns:sodipodi"; $sources)>0)
- //______________________________________________________
- : (Position:C15("xmlns:inkscape";$Txt_sources)>0)
+ //______________________________________________________
+ : (Position:C15("xmlns:inkscape"; $sources)>0)
- //______________________________________________________
+ //______________________________________________________
Else
- $Txt_sources:=xmlColoredSyntax ($Txt_sources)
+ $sources:=xmlColoredSyntax($sources)
- //________________________________________
+ //________________________________________
End case
- //#ACI0086921
- //$0:=""+$Txt_buffer+""
-$0:=$Txt_sources
-
- // ----------------------------------------------------
- // End
\ No newline at end of file
+//#ACI0086921
+return $sources
\ No newline at end of file
diff --git a/Project/Sources/Methods/xToolBox_BytesToString.4dm b/Project/Sources/Methods/xToolBox_BytesToString.4dm
index 209ffd1..821da9c 100644
--- a/Project/Sources/Methods/xToolBox_BytesToString.4dm
+++ b/Project/Sources/Methods/xToolBox_BytesToString.4dm
@@ -1,165 +1,98 @@
//%attributes = {"invisible":true,"preemptive":"capable"}
- // ----------------------------------------------------
- // Méthode : xToolBox_BytesToString
- // Créée le 28/09/05 par vdl
- // ----------------------------------------------------
-C_TEXT:C284($0)
-C_REAL:C285($1)
-C_TEXT:C284($2)
-C_TEXT:C284($3)
-C_TEXT:C284($4)
-C_LONGINT:C283($5)
+// ----------------------------------------------------
+// Méthode : xToolBox_BytesToString
+// Créée le 28/09/05 par vdl
+// ----------------------------------------------------
+#DECLARE($Num_Size : Real; $Txt_Requested_Unit : Text; $Txt_Nul : Text; $Txt_Unit : Text; $Lon_Precision : Integer) : Text
-C_LONGINT:C283($Int_Platform;$Lon_Language;$Lon_Machine;$Lon_parameters;$Lon_Precision;$Lon_System)
-C_REAL:C285($Num_Size)
-C_TEXT:C284($Txt_Format;$Txt_IntegerFormat;$Txt_Nul;$Txt_RealFormat;$Txt_Requested_Unit;$Txt_Result)
-C_TEXT:C284($Txt_Unit)
-
-If (False:C215)
- C_TEXT:C284(xToolBox_BytesToString ;$0)
- C_REAL:C285(xToolBox_BytesToString ;$1)
- C_TEXT:C284(xToolBox_BytesToString ;$2)
- C_TEXT:C284(xToolBox_BytesToString ;$3)
- C_TEXT:C284(xToolBox_BytesToString ;$4)
- C_LONGINT:C283(xToolBox_BytesToString ;$5)
-End if
-
-$Lon_parameters:=Count parameters:C259
-$Num_Size:=$1
-
-If ($Lon_parameters>1)
-
- $Txt_Requested_Unit:=$2
-
- If ($Lon_parameters>2)
-
- $Txt_Nul:=$3
-
- If ($Lon_parameters>3)
-
- $Txt_Unit:=$4
-
- If ($Lon_parameters>4)
-
- $Lon_Precision:=$5
-
- Else
-
- $Lon_Precision:=0
-
- End if
-
- Else
-
- $Txt_Unit:=""
- $Lon_Precision:=0
-
- End if
-
- Else
-
- $Txt_Nul:=""
- $Txt_Unit:=""
- $Lon_Precision:=0
-
- End if
-
-Else
-
- $Txt_Requested_Unit:=""
- $Txt_Nul:=""
- $Txt_Unit:=""
- $Lon_Precision:=0
-
-End if
+var $Txt_Format; $Txt_IntegerFormat; $Txt_RealFormat : Text
+var $Int_Platform; $Lon_Language; $Lon_Machine; $Lon_System : Integer
If (Length:C16($Txt_Unit)=0)
- //Unité en fonction de la langue
- _O_PLATFORM PROPERTIES:C365($Int_Platform;$Lon_System;$Lon_Machine;$Lon_Language)
+ // Unité en fonction de la langue
+ _O_PLATFORM PROPERTIES:C365($Int_Platform; $Lon_System; $Lon_Machine; $Lon_Language)
- If ($Lon_Language=12) //Français
+ If ($Lon_Language=12) // Français
$Txt_Unit:="o"
Else
- $Txt_Unit:="B" //In English -> "B" = Byte, "b" = bit
+ $Txt_Unit:="B" // In English -> "B" = Byte, "b" = bit
End if
End if
- //v11
+// V11
$Txt_IntegerFormat:="###,###,###,###,###,###,##0"
-$Txt_RealFormat:="###,###,###,###,###,###,##0.##" //maximum deux chiffres apres la virgule
+$Txt_RealFormat:="###,###,###,###,###,###,##0.##" // Maximum deux chiffres apres la virgule
-$Txt_Format:=Choose:C955($Lon_Precision=0;$Txt_IntegerFormat;$Txt_RealFormat)
+$Txt_Format:=$Lon_Precision=0 ? $Txt_IntegerFormat : $Txt_RealFormat
Case of
- //______________________________________________________`texte si nul
+ //______________________________________________________`texte si nul
: ($Num_Size=0)
- $Txt_Result:=$Txt_Nul
+ return $Txt_Nul
- //______________________________________________________`Texte en fonction de l'unité demandée (G/M/K/O)
+ //______________________________________________________`Texte en fonction de l'unité demandée (G/M/K/O)
: ($Txt_Requested_Unit="G")
- $Txt_Result:=String:C10(Round:C94($Num_Size/(2^30);$Lon_Precision);$Txt_Format)+Char:C90(32)+"G"+$Txt_Unit
+ return String:C10(Round:C94($Num_Size/(2^30); $Lon_Precision); $Txt_Format)+Char:C90(32)+"G"+$Txt_Unit
- //______________________________________________________
+ //______________________________________________________
: ($Txt_Requested_Unit="M")
- $Txt_Result:=String:C10(Round:C94($Num_Size/(2^20);$Lon_Precision);$Txt_Format)+Char:C90(32)+"M"+$Txt_Unit
+ return String:C10(Round:C94($Num_Size/(2^20); $Lon_Precision); $Txt_Format)+Char:C90(32)+"M"+$Txt_Unit
- //______________________________________________________
+ //______________________________________________________
: ($Txt_Requested_Unit="K")
- $Txt_Result:=String:C10(Round:C94($Num_Size/(2^10);$Lon_Precision);$Txt_Format)+Char:C90(32)+"k"+$Txt_Unit
+ return String:C10(Round:C94($Num_Size/(2^10); $Lon_Precision); $Txt_Format)+Char:C90(32)+"k"+$Txt_Unit
- //______________________________________________________
+ //______________________________________________________
: ($Txt_Requested_Unit="O")
- $Txt_Result:=String:C10($Num_Size;$Txt_IntegerFormat)+Char:C90(32)+$Txt_Unit
+ return String:C10($Num_Size; $Txt_IntegerFormat)+Char:C90(32)+$Txt_Unit
- //______________________________________________________`Texte en fonction de la taille de la valeur
+ //______________________________________________________`Texte en fonction de la taille de la valeur
- //…………………………
- : ($Num_Size>=(2^60)) //Exa
+ //…………………………
+ : ($Num_Size>=(2^60)) // Exa
- $Txt_Result:=String:C10(Round:C94($Num_Size/(2^60);$Lon_Precision);$Txt_Format)+Char:C90(32)+"E"+$Txt_Unit
+ return String:C10(Round:C94($Num_Size/(2^60); $Lon_Precision); $Txt_Format)+Char:C90(32)+"E"+$Txt_Unit
- //…………………………
- : ($Num_Size>=(2^50)) //Peta
+ //…………………………
+ : ($Num_Size>=(2^50)) // Peta
- $Txt_Result:=String:C10(Round:C94($Num_Size/(2^50);$Lon_Precision);$Txt_Format)+Char:C90(32)+"P"+$Txt_Unit
+ return String:C10(Round:C94($Num_Size/(2^50); $Lon_Precision); $Txt_Format)+Char:C90(32)+"P"+$Txt_Unit
- //…………………………
- : ($Num_Size>=(2^40)) //Tera
+ //…………………………
+ : ($Num_Size>=(2^40)) // Tera
- $Txt_Result:=String:C10(Round:C94($Num_Size/(2^40);$Lon_Precision);$Txt_Format)+Char:C90(32)+"T"+$Txt_Unit
+ return String:C10(Round:C94($Num_Size/(2^40); $Lon_Precision); $Txt_Format)+Char:C90(32)+"T"+$Txt_Unit
- //…………………………
- : ($Num_Size>=(2^30)) //Giga
+ //…………………………
+ : ($Num_Size>=(2^30)) // Giga
- $Txt_Result:=String:C10(Round:C94($Num_Size/(2^30);$Lon_Precision);$Txt_Format)+Char:C90(32)+"G"+$Txt_Unit
+ return String:C10(Round:C94($Num_Size/(2^30); $Lon_Precision); $Txt_Format)+Char:C90(32)+"G"+$Txt_Unit
- //…………………………
- : ($Num_Size>=(2^20)) //Mega
+ //…………………………
+ : ($Num_Size>=(2^20)) // Mega
- $Txt_Result:=String:C10(Round:C94($Num_Size/(2^20);$Lon_Precision);$Txt_Format)+Char:C90(32)+"M"+$Txt_Unit
+ return String:C10(Round:C94($Num_Size/(2^20); $Lon_Precision); $Txt_Format)+Char:C90(32)+"M"+$Txt_Unit
- //…………………………
- : ($Num_Size>=(2^10)) //Kilo
+ //…………………………
+ : ($Num_Size>=(2^10)) // Kilo
- $Txt_Result:=String:C10(Round:C94($Num_Size/(2^10);$Lon_Precision);$Txt_Format)+Char:C90(32)+"k"+$Txt_Unit
+ return String:C10(Round:C94($Num_Size/(2^10); $Lon_Precision); $Txt_Format)+Char:C90(32)+"k"+$Txt_Unit
- //…………………………
- Else //Octets
+ //…………………………
+ Else // Octets
- $Txt_Result:=String:C10($Num_Size;$Txt_IntegerFormat)+Char:C90(32)+$Txt_Unit
+ return String:C10($Num_Size; $Txt_IntegerFormat)+Char:C90(32)+$Txt_Unit
- //______________________________________________________
-End case
-
-$0:=$Txt_Result
\ No newline at end of file
+ //______________________________________________________
+End case
\ No newline at end of file
diff --git a/Project/Sources/Methods/xToolBox_RELEASE_MENU.4dm b/Project/Sources/Methods/xToolBox_RELEASE_MENU.4dm
index ecefc98..532fac7 100644
--- a/Project/Sources/Methods/xToolBox_RELEASE_MENU.4dm
+++ b/Project/Sources/Methods/xToolBox_RELEASE_MENU.4dm
@@ -1,35 +1,31 @@
//%attributes = {"invisible":true,"preemptive":"incapable"}
- // ----------------------------------------------------
- // Method : xToolBox_RELEASE_MENU
- // Created 21/07/06 by vdl
- // ----------------------------------------------------
- // Description
- // Clears from memory the menu $1 and all menu called from this one
- //----------------------------------------------------
-C_TEXT:C284($1)
+// ----------------------------------------------------
+// Method : xToolBox_RELEASE_MENU
+// Created 21/07/06 by vdl
+// ----------------------------------------------------
+// Description
+// Clears from memory the menu $1 and all menu called from this one
+//----------------------------------------------------
+#DECLARE($menuRef : Text)
-C_LONGINT:C283($Lon_i)
+var $i : Integer
-ARRAY TEXT:C222($ta16_References;0)
-ARRAY TEXT:C222($ta32_Labels;0)
+ARRAY TEXT:C222($ta16_References; 0)
+ARRAY TEXT:C222($ta32_Labels; 0)
-If (False:C215)
- C_TEXT:C284(xToolBox_RELEASE_MENU ;$1)
-End if
-
-If (Length:C16($1)>0)
+If (Length:C16($menuRef)>0)
- GET MENU ITEMS:C977($1;$ta32_Labels;$ta16_References)
+ GET MENU ITEMS:C977($menuRef; $ta32_Labels; $ta16_References)
- For ($Lon_i;1;Size of array:C274($ta16_References);1)
+ For ($i; 1; Size of array:C274($ta16_References); 1)
- If (Length:C16($ta16_References{$Lon_i})>0)
+ If (Length:C16($ta16_References{$i})>0)
- xToolBox_RELEASE_MENU ($ta16_References{$Lon_i}) //<-- Recursive
+ xToolBox_RELEASE_MENU($ta16_References{$i}) // <-- Recursive
End if
End for
- RELEASE MENU:C978($1)
+ RELEASE MENU:C978($menuRef)
End if
\ No newline at end of file
diff --git a/Project/Sources/Methods/xToolBox_tabCreate.4dm b/Project/Sources/Methods/xToolBox_tabCreate.4dm
index 98700c9..41d09f4 100644
--- a/Project/Sources/Methods/xToolBox_tabCreate.4dm
+++ b/Project/Sources/Methods/xToolBox_tabCreate.4dm
@@ -1,33 +1,15 @@
//%attributes = {"invisible":true,"preemptive":"incapable"}
- // ----------------------------------------------------
- // Method : xToolBox_tabCreate
- // Created 15/10/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
-C_LONGINT:C283($0)
-C_POINTER:C301($1)
-C_POINTER:C301($2)
-C_TEXT:C284($3)
-
-C_LONGINT:C283($Lon_bottom;$Lon_fontSize;$Lon_i;$Lon_left;$Lon_maxWidth;$Lon_offset)
-C_LONGINT:C283($Lon_options;$Lon_right;$Lon_Selected;$Lon_start;$Lon_tabWidth;$Lon_top)
-C_LONGINT:C283($Lon_width)
-C_POINTER:C301($Ptr_definitionArray;$Ptr_target)
-C_TEXT:C284($Dom_root;$Txt_color;$Txt_defsID;$Txt_font;$Txt_groupReference;$Txt_objectID)
-C_TEXT:C284($Txt_selected;$Txt_Stop;$Txt_tabRef)
-
-If (False:C215)
- C_LONGINT:C283(xToolBox_tabCreate ;$0)
- C_POINTER:C301(xToolBox_tabCreate ;$1)
- C_POINTER:C301(xToolBox_tabCreate ;$2)
- C_TEXT:C284(xToolBox_tabCreate ;$3)
-End if
-
-$Ptr_target:=$1
-$Ptr_definitionArray:=$2
-$Txt_color:=$3
+// ----------------------------------------------------
+// Method : xToolBox_tabCreate
+// Created 15/10/08 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($Ptr_target : Pointer; $Ptr_definitionArray : Pointer; $Txt_color : Text) : Integer
+
+var $Dom_root; $Txt_defsID; $Txt_font; $Txt_groupReference; $Txt_objectID; $Txt_selected : Text
+var $Txt_Stop; $Txt_tabRef : Text
+var $Lon_bottom; $Lon_fontSize; $Lon_i; $Lon_left; $Lon_maxWidth; $Lon_offset : Integer
+var $Lon_options; $Lon_right; $Lon_Selected; $Lon_start; $Lon_tabWidth; $Lon_top : Integer
+var $Lon_width : Integer
$Lon_Selected:=$Ptr_definitionArray->
$Txt_font:="'Lucida grande','Arial'"
@@ -42,91 +24,92 @@ If (Not:C34(Is a list:C621(<>Lon_tabList)))
End if
-OBJECT GET COORDINATES:C663($Ptr_target->;$Lon_left;$Lon_top;$Lon_right;$Lon_bottom)
+OBJECT GET COORDINATES:C663($Ptr_target->; $Lon_left; $Lon_top; $Lon_right; $Lon_bottom)
$Lon_maxWidth:=$Lon_right-$Lon_left
- // ___________________
- // / ACI0070028
- // || Date 02/05/11
- //( ) Vincent de Lachaux
- // ___________________
-$Lon_options:=SVG_Get_options
-SVG_SET_OPTIONS
-
- // ___________________
-
-$Dom_root:=SVG_New (Screen width:C187;30;"";"";True:C214)
-
-$Txt_defsID:=DOM Find XML element:C864($Dom_root;"svg/defs")
-$Txt_objectID:=DOM Create XML element:C865($Txt_defsID;"linearGradient";\
-"id";"gbackground";\
-"spreadMethod";"reflect")
-DOM SET XML ATTRIBUTE:C866($Txt_objectID;\
-"x1";0;\
-"y1";0;\
-"x2";0;\
-"y2";1)
-$Txt_Stop:=DOM Create XML element:C865($Txt_objectID;"stop";\
-"offset";"0%";\
-"stop-color";$Txt_color)
-DOM SET XML ATTRIBUTE:C866($Txt_Stop;\
-"stop-opacity";0.6)
-$Txt_Stop:=DOM Create XML element:C865($Txt_objectID;"stop";\
-"offset";"80%";\
-"stop-color";$Txt_color)
-DOM SET XML ATTRIBUTE:C866($Txt_Stop;\
-"stop-opacity";0.95)
-$Txt_objectID:=DOM Create XML element:C865($Txt_defsID;"linearGradient";\
-"id";"gClicked";\
-"spreadMethod";"reflect")
-DOM SET XML ATTRIBUTE:C866($Txt_objectID;\
-"x1";0;\
-"y1";0;\
-"x2";0;\
-"y2";1)
-$Txt_Stop:=DOM Create XML element:C865($Txt_objectID;"stop";\
-"offset";"0%";\
-"stop-color";$Txt_color)
-DOM SET XML ATTRIBUTE:C866($Txt_Stop;\
-"stop-opacity";0.2)
-$Txt_Stop:=DOM Create XML element:C865($Txt_objectID;"stop";\
-"offset";"80%";\
-"stop-color";$Txt_color)
-DOM SET XML ATTRIBUTE:C866($Txt_Stop;\
-"stop-opacity";0.5)
-
-SVG_New_rect ($Dom_root;0;0;Screen width:C187;30;0;0;$Txt_color;"url(#gbackground)";0)
-
-$Txt_groupReference:=SVG_New_group ($Dom_root;"tabs")
-
-For ($Lon_i;1;Size of array:C274($Ptr_definitionArray->);1)
+// ___________________
+// / ACI0070028
+// || Date 02/05/11
+// ( ) Vincent de Lachaux
+// ___________________
+$Lon_options:=SVG_Get_options
+SVG_SET_OPTIONS
+
+// ___________________
+
+$Dom_root:=SVG_New(Screen width:C187; 30; ""; ""; True:C214)
+
+$Txt_defsID:=DOM Find XML element:C864($Dom_root; "svg/defs")
+$Txt_objectID:=DOM Create XML element:C865($Txt_defsID; "linearGradient"; \
+"id"; "gbackground"; \
+"spreadMethod"; "reflect")
+DOM SET XML ATTRIBUTE:C866($Txt_objectID; \
+"x1"; 0; \
+"y1"; 0; \
+"x2"; 0; \
+"y2"; 1)
+$Txt_Stop:=DOM Create XML element:C865($Txt_objectID; "stop"; \
+"offset"; "0%"; \
+"stop-color"; $Txt_color)
+DOM SET XML ATTRIBUTE:C866($Txt_Stop; \
+"stop-opacity"; 0.6)
+$Txt_Stop:=DOM Create XML element:C865($Txt_objectID; "stop"; \
+"offset"; "80%"; \
+"stop-color"; $Txt_color)
+DOM SET XML ATTRIBUTE:C866($Txt_Stop; \
+"stop-opacity"; 0.95)
+$Txt_objectID:=DOM Create XML element:C865($Txt_defsID; "linearGradient"; \
+"id"; "gClicked"; \
+"spreadMethod"; "reflect")
+DOM SET XML ATTRIBUTE:C866($Txt_objectID; \
+"x1"; 0; \
+"y1"; 0; \
+"x2"; 0; \
+"y2"; 1)
+$Txt_Stop:=DOM Create XML element:C865($Txt_objectID; "stop"; \
+"offset"; "0%"; \
+"stop-color"; $Txt_color)
+DOM SET XML ATTRIBUTE:C866($Txt_Stop; \
+"stop-opacity"; 0.2)
+$Txt_Stop:=DOM Create XML element:C865($Txt_objectID; "stop"; \
+"offset"; "80%"; \
+"stop-color"; $Txt_color)
+DOM SET XML ATTRIBUTE:C866($Txt_Stop; \
+"stop-opacity"; 0.5)
+
+SVG_New_rect($Dom_root; 0; 0; Screen width:C187; 30; 0; 0; $Txt_color; "url(#gbackground)"; 0)
+
+$Txt_groupReference:=SVG_New_group($Dom_root; "tabs")
+
+For ($Lon_i; 1; Size of array:C274($Ptr_definitionArray->); 1)
- $Txt_tabRef:=SVG_New_group ($Txt_groupReference;"tab_"+String:C10($Lon_i))
+ $Txt_tabRef:=SVG_New_group($Txt_groupReference; "tab_"+String:C10($Lon_i))
$Lon_start:=$Lon_start+$Lon_width
- $Lon_width:=SVG_Get_string_width ($Ptr_definitionArray->{$Lon_i};$Txt_font;$Lon_fontSize)+$Lon_offset
- SVG_New_rect ($Txt_tabRef;$Lon_start;0.5;$Lon_width;20;0;0;"white";"white";1)
- SVG_New_rect ($Txt_tabRef;$Lon_start;0;$Lon_width;20;0;0;$Txt_color;"url(#gbackground)";1)
- $Txt_selected:=SVG_New_rect ($Txt_tabRef;$Lon_start;0;$Lon_width;20;0;0;$Txt_color;"url(#gClicked)")
- SVG_SET_ID ($Txt_selected;"selected_"+String:C10($Lon_i))
- SVG_SET_VISIBILITY ($Txt_selected;$Lon_Selected=$Lon_i)
- SVG_New_text ($Txt_tabRef;$Ptr_definitionArray->{$Lon_i};$Lon_start+($Lon_width/2);4;$Txt_font;$Lon_fontSize;Plain:K14:1;Align center:K42:3;"white")
+ $Lon_width:=SVG_Get_string_width($Ptr_definitionArray->{$Lon_i}; $Txt_font; $Lon_fontSize)+$Lon_offset
+ SVG_New_rect($Txt_tabRef; $Lon_start; 0.5; $Lon_width; 20; 0; 0; "white"; "white"; 1)
+ SVG_New_rect($Txt_tabRef; $Lon_start; 0; $Lon_width; 20; 0; 0; $Txt_color; "url(#gbackground)"; 1)
+ $Txt_selected:=SVG_New_rect($Txt_tabRef; $Lon_start; 0; $Lon_width; 20; 0; 0; $Txt_color; "url(#gClicked)")
+ SVG_SET_ID($Txt_selected; "selected_"+String:C10($Lon_i))
+ SVG_SET_VISIBILITY($Txt_selected; $Lon_Selected=$Lon_i)
+ SVG_New_text($Txt_tabRef; $Ptr_definitionArray->{$Lon_i}; $Lon_start+($Lon_width/2); 4; $Txt_font; $Lon_fontSize; Plain:K14:1; Align center:K42:3; "white")
$Lon_tabWidth:=$Lon_tabWidth+$Lon_width
End for
- //Center
+// Center
+
$Lon_offset:=($Lon_maxWidth/2)-($Lon_tabWidth/2)
-SVG_SET_TRANSFORM_TRANSLATE ($Txt_groupReference;$Lon_offset;5)
+SVG_SET_TRANSFORM_TRANSLATE($Txt_groupReference; $Lon_offset; 5)
-SVG EXPORT TO PICTURE:C1017($Dom_root;$Ptr_target->)
+SVG EXPORT TO PICTURE:C1017($Dom_root; $Ptr_target->)
-SVG_SET_OPTIONS ($Lon_options)
+SVG_SET_OPTIONS($Lon_options)
<>svg_tabID:=<>svg_tabID+1
-APPEND TO LIST:C376(<>Lon_tabList;"";<>svg_tabID)
-SET LIST ITEM PARAMETER:C986(<>Lon_tabList;<>svg_tabID;"DOM";$Dom_root)
-SET LIST ITEM PARAMETER:C986(<>Lon_tabList;<>svg_tabID;"width";$Lon_tabWidth)
-SET LIST ITEM PARAMETER:C986(<>Lon_tabList;<>svg_tabID;"selected";$Lon_Selected)
+APPEND TO LIST:C376(<>Lon_tabList; ""; <>svg_tabID)
+SET LIST ITEM PARAMETER:C986(<>Lon_tabList; <>svg_tabID; "DOM"; $Dom_root)
+SET LIST ITEM PARAMETER:C986(<>Lon_tabList; <>svg_tabID; "width"; $Lon_tabWidth)
+SET LIST ITEM PARAMETER:C986(<>Lon_tabList; <>svg_tabID; "selected"; $Lon_Selected)
-$0:=<>svg_tabID
\ No newline at end of file
+return <>svg_tabID
\ No newline at end of file
diff --git a/Project/Sources/Methods/xToolBox_tabHandler.4dm b/Project/Sources/Methods/xToolBox_tabHandler.4dm
index dd1322f..2c4eea7 100644
--- a/Project/Sources/Methods/xToolBox_tabHandler.4dm
+++ b/Project/Sources/Methods/xToolBox_tabHandler.4dm
@@ -1,115 +1,95 @@
//%attributes = {"invisible":true,"preemptive":"incapable"}
- // ----------------------------------------------------
- // Method : xToolBox_tabHandler
- // Created 15/10/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
-C_LONGINT:C283($0)
-C_LONGINT:C283($1)
-C_POINTER:C301($2)
-C_LONGINT:C283($3)
-C_LONGINT:C283($4)
+// ----------------------------------------------------
+// Method : xToolBox_tabHandler
+// Created 15/10/08 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($Lon_Event : Integer; $Ptr_target : Pointer; $Lon_tabID : Integer; $Lon_Selected : Integer) : Integer
-C_LONGINT:C283($Lon_bottom;$Lon_Event;$Lon_left;$Lon_maxWidth;$Lon_offset;$Lon_right)
-C_LONGINT:C283($Lon_Selected;$Lon_tabID;$Lon_tabWidth;$Lon_top)
-C_POINTER:C301($Ptr_target)
-C_TEXT:C284($Txt_id;$Txt_svgReference)
+var $Txt_id; $Txt_svgReference : Text
+var $Lon_bottom; $Lon_left; $Lon_maxWidth; $Lon_offset; $Lon_right; $Lon_tabWidth : Integer
+var $Lon_top : Integer
-If (False:C215)
- C_LONGINT:C283(xToolBox_tabHandler ;$0)
- C_LONGINT:C283(xToolBox_tabHandler ;$1)
- C_POINTER:C301(xToolBox_tabHandler ;$2)
- C_LONGINT:C283(xToolBox_tabHandler ;$3)
- C_LONGINT:C283(xToolBox_tabHandler ;$4)
-End if
-
-$Lon_Event:=$1
-$Ptr_target:=$2
-$Lon_tabID:=$3
-
- //%W-518.7
+//%W-518.7
If (Undefined:C82(<>Lon_tabList))
- C_LONGINT:C283(<>Lon_tabList)
+ var <>Lon_tabList : Integer
End if
- //%W+518.7
+//%W+518.7
Case of
- //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: (Not:C34(Is a list:C621(<>Lon_tabList)))
- //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
- : (List item position:C629(<>Lon_tabList;$Lon_tabID)=0)
+ //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ : (List item position:C629(<>Lon_tabList; $Lon_tabID)=0)
- //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
Else
- GET LIST ITEM PARAMETER:C985(<>Lon_tabList;$Lon_tabID;"DOM";$Txt_svgReference)
- GET LIST ITEM PARAMETER:C985(<>Lon_tabList;$Lon_tabID;"width";$Lon_tabWidth)
- GET LIST ITEM PARAMETER:C985(<>Lon_tabList;$Lon_tabID;"selected";$Lon_Selected)
+ GET LIST ITEM PARAMETER:C985(<>Lon_tabList; $Lon_tabID; "DOM"; $Txt_svgReference)
+ GET LIST ITEM PARAMETER:C985(<>Lon_tabList; $Lon_tabID; "width"; $Lon_tabWidth)
+ GET LIST ITEM PARAMETER:C985(<>Lon_tabList; $Lon_tabID; "selected"; $Lon_Selected)
Case of
- //______________________________________________________
+ //______________________________________________________
: ($Lon_Event=On Clicked:K2:4)
- $Txt_id:=SVG Find element ID by coordinates:C1054($Ptr_target->;MouseX;MouseY)
+ $Txt_id:=SVG Find element ID by coordinates:C1054($Ptr_target->; MouseX; MouseY)
If ($Txt_id="tab_@")
- SVG_SET_VISIBILITY (SVG_Find_ID ($Txt_svgReference;"selected_"+String:C10($Lon_Selected));False:C215)
- SVG_SET_VISIBILITY (SVG_Find_ID ($Txt_svgReference;Replace string:C233($Txt_id;"tab_";"selected_"));True:C214)
+ SVG_SET_VISIBILITY(SVG_Find_ID($Txt_svgReference; "selected_"+String:C10($Lon_Selected)); False:C215)
+ SVG_SET_VISIBILITY(SVG_Find_ID($Txt_svgReference; Replace string:C233($Txt_id; "tab_"; "selected_")); True:C214)
$Lon_Selected:=Num:C11($Txt_id)
- SET LIST ITEM PARAMETER:C986(<>Lon_tabList;$Lon_tabID;"selected";$Lon_Selected)
+ SET LIST ITEM PARAMETER:C986(<>Lon_tabList; $Lon_tabID; "selected"; $Lon_Selected)
- SVG EXPORT TO PICTURE:C1017($Txt_svgReference;$Ptr_target->)
+ SVG EXPORT TO PICTURE:C1017($Txt_svgReference; $Ptr_target->)
End if
- $0:=$Lon_Selected
+ return $Lon_Selected
- //______________________________________________________
+ //______________________________________________________
: ($Lon_Event=On Resize:K2:27)
- OBJECT GET COORDINATES:C663($Ptr_target->;$Lon_left;$Lon_top;$Lon_right;$Lon_bottom)
+ OBJECT GET COORDINATES:C663($Ptr_target->; $Lon_left; $Lon_top; $Lon_right; $Lon_bottom)
$Lon_maxWidth:=$Lon_right-$Lon_left
$Lon_offset:=($Lon_maxWidth/2)-($Lon_tabWidth/2)
- SVG_SET_TRANSFORM_TRANSLATE (SVG_Find_ID ($Txt_svgReference;"tabs");$Lon_offset;5)
+ SVG_SET_TRANSFORM_TRANSLATE(SVG_Find_ID($Txt_svgReference; "tabs"); $Lon_offset; 5)
- SVG EXPORT TO PICTURE:C1017($Txt_svgReference;$Ptr_target->)
+ SVG EXPORT TO PICTURE:C1017($Txt_svgReference; $Ptr_target->)
- //______________________________________________________
+ //______________________________________________________
: ($Lon_Event=On Unload:K2:2)
- DELETE FROM LIST:C624(<>Lon_tabList;$Lon_tabID)
+ DELETE FROM LIST:C624(<>Lon_tabList; $Lon_tabID)
- //______________________________________________________
+ //______________________________________________________
: ($Lon_Event=On Selection Change:K2:29)
- SVG_SET_VISIBILITY (SVG_Find_ID ($Txt_svgReference;"selected_"+String:C10($Lon_Selected));False:C215)
+ SVG_SET_VISIBILITY(SVG_Find_ID($Txt_svgReference; "selected_"+String:C10($Lon_Selected)); False:C215)
- $Lon_Selected:=$4
- SET LIST ITEM PARAMETER:C986(<>Lon_tabList;$Lon_tabID;"selected";$Lon_Selected)
- SVG_SET_VISIBILITY (SVG_Find_ID ($Txt_svgReference;"selected_"+String:C10($Lon_Selected));True:C214)
+ SET LIST ITEM PARAMETER:C986(<>Lon_tabList; $Lon_tabID; "selected"; $Lon_Selected)
+ SVG_SET_VISIBILITY(SVG_Find_ID($Txt_svgReference; "selected_"+String:C10($Lon_Selected)); True:C214)
- SVG EXPORT TO PICTURE:C1017($Txt_svgReference;$Ptr_target->)
+ SVG EXPORT TO PICTURE:C1017($Txt_svgReference; $Ptr_target->)
- //______________________________________________________
+ //______________________________________________________
Else
TRACE:C157
- //______________________________________________________
+ //______________________________________________________
End case
- //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
End case
\ No newline at end of file
diff --git a/Project/Sources/Methods/xToolbox_GetLastItemFromPath.4dm b/Project/Sources/Methods/xToolbox_GetLastItemFromPath.4dm
index 3df8c8f..4f9dce3 100644
--- a/Project/Sources/Methods/xToolbox_GetLastItemFromPath.4dm
+++ b/Project/Sources/Methods/xToolbox_GetLastItemFromPath.4dm
@@ -1,65 +1,35 @@
//%attributes = {"invisible":true,"preemptive":"capable"}
- // ----------------------------------------------------
- // Method : xToolbox_GetLastItemFromPath
- // Created 06/10/08 by Vincent de Lachaux
- // ----------------------------------------------------
- // Description
- //
- // ----------------------------------------------------
-C_TEXT:C284($0)
-C_TEXT:C284($1)
-C_TEXT:C284($2)
+// ----------------------------------------------------
+// Method : xToolbox_GetLastItemFromPath
+// Created 06/10/08 by Vincent de Lachaux
+// ----------------------------------------------------
+#DECLARE($Txt_Path : Text; $Txt_Separator : Text) : Text
-C_LONGINT:C283($Lon_i;$Lon_Length;$Lon_Position)
-C_TEXT:C284($Txt_Path;$Txt_Separator)
+var $Lon_i; $Lon_Length; $Lon_Position : Integer
-If (False:C215)
- C_TEXT:C284(xToolbox_GetLastItemFromPath ;$0)
- C_TEXT:C284(xToolbox_GetLastItemFromPath ;$1)
- C_TEXT:C284(xToolbox_GetLastItemFromPath ;$2)
-End if
-
-If (Count parameters:C259>=1)
-
- $Txt_Path:=$1
-
- If (Count parameters:C259>=2)
-
- $Txt_Separator:=$2
-
- Else
-
- $Txt_Separator:=Folder separator:K24:12
-
- End if
-
-Else
-
- TRACE:C157
-
-End if
+$Txt_Separator:=$Txt_Separator || Folder separator:K24:12
-$Lon_Position:=Position:C15($Txt_Separator;$Txt_Path)
+$Lon_Position:=Position:C15($Txt_Separator; $Txt_Path)
If ($Lon_Position>0)
$Lon_Length:=Length:C16($Txt_Path)
- If ($Txt_Path[[$Lon_Length]]=$Txt_Separator) //It's a folder
+ If ($Txt_Path[[$Lon_Length]]=$Txt_Separator) // It's a folder
$Lon_Length:=$Lon_Length-1
End if
- For ($Lon_i;$Lon_Length;1;-1)
+ For ($Lon_i; $Lon_Length; 1; -1)
If ($Txt_Path[[$Lon_i]]=$Txt_Separator)
- $Txt_Path:=Substring:C12($Txt_Path;$Lon_i+1)
+ $Txt_Path:=Substring:C12($Txt_Path; $Lon_i+1)
$Lon_i:=0
End if
End for
End if
-$0:=$Txt_Path
\ No newline at end of file
+return $Txt_Path
\ No newline at end of file
diff --git a/Project/Sources/folders.json b/Project/Sources/folders.json
index e59710d..7e8eb94 100644
--- a/Project/Sources/folders.json
+++ b/Project/Sources/folders.json
@@ -15,7 +15,6 @@
"00_DEV": {
"methods": [
"00_test",
- "Compiler_test",
"testCallbackMethod"
]
},
@@ -117,7 +116,6 @@
"about",
"Color_main",
"colors",
- "COMPILER_4DPop",
"SVGTool_Display_colors",
"SVGTool_Display_syntax",
"SVGTool_Display_viewer",