Update of manual and test.

Author: tpersson

doc/latexuguide/elements.tex

@@ -1810,26 +1810,32 @@ \section{Change of reference system}
 be referred to the new coordinate system where both translations and
 rotations are applied.
 
-
 \section{SixTrack Marker}
 
 \madbox{
 label: SIXMARKER, \= ELTYPE=real, ATTR=\{real, \ldots \},  \\
                \> F3STRING=string, F3VECTOR=\{real, \ldots \} ;
 }
-f3string="NEW ELEMENT {newline} {0}, {1} {newline}NEXT"
-The \texttt{SIXMARKER} element allows the definition of an arbitrary marker that is converted to SixTrack.
-The element has no impact in MAD-X.
+The \texttt{SIXMARKER} element allows the definition of a marker that is converted to SixTrack.
+The element has no effect in MAD-X.
 \begin{madlist}
    \ttitem{ELTYPE} is the element type number in SixTrack, converted to the first column in fc.2.
    \ttitem{ATTR} This defines the remaining columns of the fc.2 file.
    \ttitem{F3STRING} Defines the String that is written to the fc.3 file, \{newline\} creates a new line in the output
-   and \{0\}\ldots\{10\} are being replaced with the values in F3VECTOR.
-   \ttitem{F3VECTOR} The values defined will be converted to the location defined in the F3STRING. 
+   and \{0\}\ldots\{10\} are being replaced with the values in \texttt{F3VECTOR}.
+   \ttitem{F3VECTOR} The values defined will be converted to the location defined in the \texttt{F3STRING}. 
 \end{madlist}
-
 \textbf{Example:}
 \madxmp{
-DR1: \= DRIFT, \= L=1.5; \\
-DR2: \> DRIFT, \> L=DR1->L;
+sm1:SIXMARKER, ELTYPE=2, ATTR=\{0.1,2,3,4,5,6,7\}, \\
+,F3STRING="NEW\_ELEMENT \{newline\} \{0\}, \{1\} \{newline\} NEXT",\\
+F3VECTOR=\{0.2, 0.5\};\\
 }
+Will produce in the output file fc.3:
+\madxmp{
+NEW\_ELEMENT \\                                                                                                  
+2.00000000e-01, 5.00000000e-01 \\                                                                                         
+NEXT
+}
+
+%%% END

tests/test-c6t-7/test-c6t-7.ref

@@ -1,15 +1,15 @@
 
   ++++++++++++++++++++++++++++++++++++++++++++
-  +     MAD-X 5.05.02  (64 bit, Linux)       +
+  +     MAD-X 5.06.00  (64 bit, Linux)       +
   + Support: [email protected], http://cern.ch/mad +
-  + Release   date: 2019.07.25               +
-  + Execution date: 2020.07.29 11:40:44      +
+  + Release   date: 2020.08.13               +
+  + Execution date: 2020.08.12 09:18:15      +
   ++++++++++++++++++++++++++++++++++++++++++++
 circum=10;
 
 
 
-sm1:sixmarker, eltype=2, attr={0.1,2,3,4,5,6,7}, f3string="NEW ELEMENT {newline} {0}, {1} {newline}NEXT", f3vector={0.2, 0.5};
+sm1:SIXMARKER, eltype=2, attr={0.1,2,3,4,5,6,7}, f3string="NEW_ELEMENT {newline} {0}, {1} {newline}NEXT", f3vector={0.2, 0.5};
 
 m1: multipole, knl={0, 0.2};
 
@@ -26,7 +26,7 @@ parameter: polarity   double value:                  0
 parameter: tilt   double value:                  0
 parameter: lrad   double value:                  0
 parameter: magnet   integer:          0
-parameter: f3string   string: NEW ELEMENT {newline} {0}, {1} {newline}NEXT
+parameter: f3string   string: NEW_ELEMENT {newline} {0}, {1} {newline}NEXT
 parameter: f3vector   double array: 2.000000e-01 5.000000e-01 
 parameter: eltype   integer:          2
 parameter: attr   double array: 1.000000e-01 2.000000e+00 3.000000e+00 4.000000e+00 5.000000e+00 6.000000e+00 7.000000e+00 
@@ -77,7 +77,7 @@ parameter: polarity   double value:                  0
 parameter: tilt   double value:                  0
 parameter: lrad   double value:                  0
 parameter: magnet   integer:          0
-parameter: f3string   string: NEW ELEMENT {newline} {0}, {1} {newline}NEXT
+parameter: f3string   string: NEW_ELEMENT {newline} {0}, {1} {newline}NEXT
 parameter: f3vector   double array: 2.000000e-01 5.000000e-01 
 parameter: eltype   integer:          2
 parameter: attr   double array: 1.000000e-01 2.000000e+00 3.000000e+00 4.000000e+00 5.000000e+00 6.000000e+00 7.000000e+00