* updates for libxml2

    * disabled legacy mode in libxml2 headers


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@11646 3ad0048d-3df7-0310-abae-a5850022a9f2

7 files changed, 548 insertions, 13 deletions

diff --git a/packages/libxml/examples/test1.xml b/packages/libxml/examples/test1.xml
index 7e3d4b8033..d176b247da 100755
--- a/packages/libxml/examples/test1.xml
+++ b/packages/libxml/examples/test1.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<gpx xmlns="http://www.topografix.com/GPX/1/1" creator="MapSource 6.14.1" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<gpx xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" creator="MapSource 6.14.1" version="1.1" xsi:schemaLocation="http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www8.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
   <metadata>
     <link href="http://www.garmin.com">
       <text>Garmin International</text>
@@ -8,7 +7,6 @@
     <time>2008-07-31T12:26:34Z</time>
     <bounds maxlat="47.5625744" maxlon="9.0921307" minlat="47.4293518" minlon="8.7876463"/>
   </metadata>
-
   <rte>
     <name>Islikon bis EllikonAnDerThu</name>
     <extensions>
@@ -2074,5 +2072,4 @@
       </extensions>
     </rtept>
   </rte>
-
 </gpx>
diff --git a/packages/libxml/examples/test2.xml b/packages/libxml/examples/test2.xml
index 0beaf91be1..5cb38f1ac3 100755
--- a/packages/libxml/examples/test2.xml
+++ b/packages/libxml/examples/test2.xml
@@ -1,2 +1,528 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd"><Author xsi:type="Application_t"><Name>EDGE705</Name><Build><Version><VersionMajor>2</VersionMajor><VersionMinor>3</VersionMinor><BuildMajor>0</BuildMajor><BuildMinor>0</BuildMinor></Version><Type>Release</Type></Build><LangID>NA</LangID><PartNumber>006-B0625-00</PartNumber></Author><Extensions><Profile xmlns="http://www.garmin.com/xmlschemas/UserProfile/v2"><BirthDate>1981-04-29</BirthDate><WeightKilograms>72.000000</WeightKilograms><Gender>Male</Gender><Activities xsi:type="ProfileActivity_t" Sport="Running"><MaximumHeartRateBpm xsi:type="HeartRateInBeatsPerMinute_t"><Value>185</Value></MaximumHeartRateBpm><GearWeightKilograms>0.000000</GearWeightKilograms><HeartRateZones><Number>1</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>93</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>111</Value></High></HeartRateZones><HeartRateZones><Number>2</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>111</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>130</Value></High></HeartRateZones><HeartRateZones><Number>3</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>130</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>148</Value></High></HeartRateZones><HeartRateZones><Number>4</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>148</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>167</Value></High></HeartRateZones><HeartRateZones><Number>5</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>167</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>185</Value></High></HeartRateZones><SpeedZones><Number>1</Number><Name>1</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Pace</ViewAs><LowInMetersPerSecond>1.072896</LowInMetersPerSecond><HighInMetersPerSecond>1.341120</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>2</Number><Name>2</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Pace</ViewAs><LowInMetersPerSecond>1.341120</LowInMetersPerSecond><HighInMetersPerSecond>1.676400</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>3</Number><Name>3</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Pace</ViewAs><LowInMetersPerSecond>1.577788</LowInMetersPerSecond><HighInMetersPerSecond>2.062000</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>4</Number><Name>4</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Pace</ViewAs><LowInMetersPerSecond>1.915000</LowInMetersPerSecond><HighInMetersPerSecond>2.438400</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>5</Number><Name>5</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Pace</ViewAs><LowInMetersPerSecond>2.235200</LowInMetersPerSecond><HighInMetersPerSecond>2.974900</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>6</Number><Name>6</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Pace</ViewAs><LowInMetersPerSecond>2.682240</LowInMetersPerSecond><HighInMetersPerSecond>3.352800</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>7</Number><Name>7</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Pace</ViewAs><LowInMetersPerSecond>2.974900</LowInMetersPerSecond><HighInMetersPerSecond>3.831771</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>8</Number><Name>8</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Pace</ViewAs><LowInMetersPerSecond>3.831771</LowInMetersPerSecond><HighInMetersPerSecond>5.364480</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>9</Number><Name>9</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Pace</ViewAs><LowInMetersPerSecond>5.364480</LowInMetersPerSecond><HighInMetersPerSecond>6.705600</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>10</Number><Name>10</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Pace</ViewAs><LowInMetersPerSecond>6.705600</LowInMetersPerSecond><HighInMetersPerSecond>8.940800</HighInMetersPerSecond></Value></SpeedZones></Activities><Activities xsi:type="BikeProfileActivity_t" Sport="Biking"><MaximumHeartRateBpm xsi:type="HeartRateInBeatsPerMinute_t"><Value>178</Value></MaximumHeartRateBpm><GearWeightKilograms>11.000000</GearWeightKilograms><HeartRateZones><Number>1</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>80</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>114</Value></High></HeartRateZones><HeartRateZones><Number>2</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>115</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>134</Value></High></HeartRateZones><HeartRateZones><Number>3</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>135</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>157</Value></High></HeartRateZones><HeartRateZones><Number>4</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>158</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>167</Value></High></HeartRateZones><HeartRateZones><Number>5</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>168</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>178</Value></High></HeartRateZones><SpeedZones><Number>1</Number><Name>Climb 4</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>1.072896</LowInMetersPerSecond><HighInMetersPerSecond>1.333333</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>2</Number><Name>Climb 3</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>1.341120</LowInMetersPerSecond><HighInMetersPerSecond>1.676400</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>3</Number><Name>Climb 2</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>1.577788</LowInMetersPerSecond><HighInMetersPerSecond>2.062000</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>4</Number><Name>Climb 1</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>1.915000</LowInMetersPerSecond><HighInMetersPerSecond>2.438400</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>5</Number><Name>Flat 3</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>2.235200</LowInMetersPerSecond><HighInMetersPerSecond>2.974900</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>6</Number><Name>Flat 2</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>2.682240</LowInMetersPerSecond><HighInMetersPerSecond>3.352800</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>7</Number><Name>Flat 1</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>2.974900</LowInMetersPerSecond><HighInMetersPerSecond>3.831771</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>8</Number><Name>Descent</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>3.831771</LowInMetersPerSecond><HighInMetersPerSecond>5.364480</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>9</Number><Name>Sprint</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>5.364480</LowInMetersPerSecond><HighInMetersPerSecond>6.705600</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>10</Number><Name>Max Speed</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>6.705600</LowInMetersPerSecond><HighInMetersPerSecond>8.944445</HighInMetersPerSecond></Value></SpeedZones><Extensions><PowerZones xmlns="http://www.garmin.com/xmlschemas/ProfileExtension/v1"><FTP>300</FTP><PowerZone><Number>1</Number><Low>75</Low><High>165</High></PowerZone><PowerZone><Number>2</Number><Low>168</Low><High>225</High></PowerZone><PowerZone><Number>3</Number><Low>228</Low><High>270</High></PowerZone><PowerZone><Number>4</Number><Low>273</Low><High>315</High></PowerZone><PowerZone><Number>5</Number><Low>318</Low><High>360</High></PowerZone><PowerZone><Number>6</Number><Low>363</Low><High>450</High></PowerZone><PowerZone><Number>7</Number><Low>453</Low><High>600</High></PowerZone></PowerZones></Extensions><Bike xsi:type="BikeData_t" HasCadenceSensor="true" HasPowerSensor="true"><Name>SLC 01</Name><OdometerMeters>1257771.625000</OdometerMeters><WeightKilograms>7.000000</WeightKilograms><WheelSize AutoWheelSize="true"><SizeMillimeters>2066</SizeMillimeters></WheelSize></Bike><Bike xsi:type="BikeData_t" HasCadenceSensor="false" HasPowerSensor="true"><Name>MTB</Name><OdometerMeters>7236.252441</OdometerMeters><WeightKilograms>10.000000</WeightKilograms><WheelSize AutoWheelSize="true"><SizeMillimeters>2050</SizeMillimeters></WheelSize></Bike><Bike xsi:type="BikeData_t" HasCadenceSensor="true" HasPowerSensor="true"><Name></Name><OdometerMeters>94818.570312</OdometerMeters><WeightKilograms>11.000000</WeightKilograms><WheelSize AutoWheelSize="true"><SizeMillimeters>2088</SizeMillimeters></WheelSize></Bike></Activities><Activities xsi:type="ProfileActivity_t" Sport="Other"><MaximumHeartRateBpm xsi:type="HeartRateInBeatsPerMinute_t"><Value>185</Value></MaximumHeartRateBpm><GearWeightKilograms>0.000000</GearWeightKilograms><HeartRateZones><Number>1</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>93</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>111</Value></High></HeartRateZones><HeartRateZones><Number>2</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>111</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>130</Value></High></HeartRateZones><HeartRateZones><Number>3</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>130</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>148</Value></High></HeartRateZones><HeartRateZones><Number>4</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>148</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>167</Value></High></HeartRateZones><HeartRateZones><Number>5</Number><ViewAs>Beats Per Minute</ViewAs><Low xsi:type="HeartRateInBeatsPerMinute_t"><Value>167</Value></Low><High xsi:type="HeartRateInBeatsPerMinute_t"><Value>185</Value></High></HeartRateZones><SpeedZones><Number>1</Number><Name>1</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>1.072896</LowInMetersPerSecond><HighInMetersPerSecond>1.341120</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>2</Number><Name>2</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>1.341120</LowInMetersPerSecond><HighInMetersPerSecond>1.676400</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>3</Number><Name>3</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>1.577788</LowInMetersPerSecond><HighInMetersPerSecond>2.062000</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>4</Number><Name>4</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>1.915000</LowInMetersPerSecond><HighInMetersPerSecond>2.438400</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>5</Number><Name>5</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>2.235200</LowInMetersPerSecond><HighInMetersPerSecond>2.974900</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>6</Number><Name>6</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>2.682240</LowInMetersPerSecond><HighInMetersPerSecond>3.352800</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>7</Number><Name>7</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>2.974900</LowInMetersPerSecond><HighInMetersPerSecond>3.831771</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>8</Number><Name>8</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>3.831771</LowInMetersPerSecond><HighInMetersPerSecond>5.364480</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>9</Number><Name>9</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>5.364480</LowInMetersPerSecond><HighInMetersPerSecond>6.705600</HighInMetersPerSecond></Value></SpeedZones><SpeedZones><Number>10</Number><Name>10</Name><Value xsi:type="CustomSpeedZone_t"><ViewAs>Speed</ViewAs><LowInMetersPerSecond>6.705600</LowInMetersPerSecond><HighInMetersPerSecond>8.940800</HighInMetersPerSecond></Value></SpeedZones></Activities></Profile></Extensions></TrainingCenterDatabase>
\ No newline at end of file
+<TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd">
+    <Author xsi:type="Application_t">
+        <Name>EDGE705</Name>
+        <Build>
+            <Version>
+                <VersionMajor>2</VersionMajor>
+                <VersionMinor>3</VersionMinor>
+                <BuildMajor>0</BuildMajor>
+                <BuildMinor>0</BuildMinor>
+            </Version>
+            <Type>Release</Type>
+        </Build>
+        <LangID>NA</LangID>
+        <PartNumber>006-B0625-00</PartNumber>
+    </Author>
+    <Extensions>
+        <Profile xmlns="http://www.garmin.com/xmlschemas/UserProfile/v2">
+            <BirthDate>1981-04-29</BirthDate>
+            <WeightKilograms>72.000000</WeightKilograms>
+            <Gender>Male</Gender>
+            <Activities xsi:type="ProfileActivity_t" Sport="Running">
+                <MaximumHeartRateBpm xsi:type="HeartRateInBeatsPerMinute_t">
+                    <Value>185</Value>
+                </MaximumHeartRateBpm>
+                <GearWeightKilograms>0.000000</GearWeightKilograms>
+                <HeartRateZones>
+                    <Number>1</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>93</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>111</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>2</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>111</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>130</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>3</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>130</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>148</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>4</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>148</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>167</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>5</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>167</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>185</Value>
+                    </High>
+                </HeartRateZones>
+                <SpeedZones>
+                    <Number>1</Number>
+                    <Name>1</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Pace</ViewAs>
+                        <LowInMetersPerSecond>1.072896</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>1.341120</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>2</Number>
+                    <Name>2</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Pace</ViewAs>
+                        <LowInMetersPerSecond>1.341120</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>1.676400</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>3</Number>
+                    <Name>3</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Pace</ViewAs>
+                        <LowInMetersPerSecond>1.577788</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>2.062000</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>4</Number>
+                    <Name>4</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Pace</ViewAs>
+                        <LowInMetersPerSecond>1.915000</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>2.438400</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>5</Number>
+                    <Name>5</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Pace</ViewAs>
+                        <LowInMetersPerSecond>2.235200</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>2.974900</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>6</Number>
+                    <Name>6</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Pace</ViewAs>
+                        <LowInMetersPerSecond>2.682240</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>3.352800</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>7</Number>
+                    <Name>7</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Pace</ViewAs>
+                        <LowInMetersPerSecond>2.974900</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>3.831771</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>8</Number>
+                    <Name>8</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Pace</ViewAs>
+                        <LowInMetersPerSecond>3.831771</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>5.364480</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>9</Number>
+                    <Name>9</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Pace</ViewAs>
+                        <LowInMetersPerSecond>5.364480</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>6.705600</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>10</Number>
+                    <Name>10</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Pace</ViewAs>
+                        <LowInMetersPerSecond>6.705600</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>8.940800</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+            </Activities>
+            <Activities xsi:type="BikeProfileActivity_t" Sport="Biking">
+                <MaximumHeartRateBpm xsi:type="HeartRateInBeatsPerMinute_t">
+                    <Value>178</Value>
+                </MaximumHeartRateBpm>
+                <GearWeightKilograms>11.000000</GearWeightKilograms>
+                <HeartRateZones>
+                    <Number>1</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>80</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>114</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>2</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>115</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>134</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>3</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>135</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>157</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>4</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>158</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>167</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>5</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>168</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>178</Value>
+                    </High>
+                </HeartRateZones>
+                <SpeedZones>
+                    <Number>1</Number>
+                    <Name>Climb 4</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>1.072896</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>1.333333</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>2</Number>
+                    <Name>Climb 3</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>1.341120</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>1.676400</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>3</Number>
+                    <Name>Climb 2</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>1.577788</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>2.062000</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>4</Number>
+                    <Name>Climb 1</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>1.915000</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>2.438400</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>5</Number>
+                    <Name>Flat 3</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>2.235200</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>2.974900</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>6</Number>
+                    <Name>Flat 2</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>2.682240</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>3.352800</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>7</Number>
+                    <Name>Flat 1</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>2.974900</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>3.831771</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>8</Number>
+                    <Name>Descent</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>3.831771</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>5.364480</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>9</Number>
+                    <Name>Sprint</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>5.364480</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>6.705600</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>10</Number>
+                    <Name>Max Speed</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>6.705600</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>8.944445</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <Extensions>
+                    <PowerZones xmlns="http://www.garmin.com/xmlschemas/ProfileExtension/v1">
+                        <FTP>300</FTP>
+                        <PowerZone>
+                            <Number>1</Number>
+                            <Low>75</Low>
+                            <High>165</High>
+                        </PowerZone>
+                        <PowerZone>
+                            <Number>2</Number>
+                            <Low>168</Low>
+                            <High>225</High>
+                        </PowerZone>
+                        <PowerZone>
+                            <Number>3</Number>
+                            <Low>228</Low>
+                            <High>270</High>
+                        </PowerZone>
+                        <PowerZone>
+                            <Number>4</Number>
+                            <Low>273</Low>
+                            <High>315</High>
+                        </PowerZone>
+                        <PowerZone>
+                            <Number>5</Number>
+                            <Low>318</Low>
+                            <High>360</High>
+                        </PowerZone>
+                        <PowerZone>
+                            <Number>6</Number>
+                            <Low>363</Low>
+                            <High>450</High>
+                        </PowerZone>
+                        <PowerZone>
+                            <Number>7</Number>
+                            <Low>453</Low>
+                            <High>600</High>
+                        </PowerZone>
+                    </PowerZones>
+                </Extensions>
+                <Bike xsi:type="BikeData_t" HasCadenceSensor="true" HasPowerSensor="true">
+                    <Name>SLC 01</Name>
+                    <OdometerMeters>1257771.625000</OdometerMeters>
+                    <WeightKilograms>7.000000</WeightKilograms>
+                    <WheelSize AutoWheelSize="true">
+                        <SizeMillimeters>2066</SizeMillimeters>
+                    </WheelSize>
+                </Bike>
+                <Bike xsi:type="BikeData_t" HasCadenceSensor="false" HasPowerSensor="true">
+                    <Name>MTB</Name>
+                    <OdometerMeters>7236.252441</OdometerMeters>
+                    <WeightKilograms>10.000000</WeightKilograms>
+                    <WheelSize AutoWheelSize="true">
+                        <SizeMillimeters>2050</SizeMillimeters>
+                    </WheelSize>
+                </Bike>
+                <Bike xsi:type="BikeData_t" HasCadenceSensor="true" HasPowerSensor="true">
+                    <Name/>
+                    <OdometerMeters>94818.570312</OdometerMeters>
+                    <WeightKilograms>11.000000</WeightKilograms>
+                    <WheelSize AutoWheelSize="true">
+                        <SizeMillimeters>2088</SizeMillimeters>
+                    </WheelSize>
+                </Bike>
+            </Activities>
+            <Activities xsi:type="ProfileActivity_t" Sport="Other">
+                <MaximumHeartRateBpm xsi:type="HeartRateInBeatsPerMinute_t">
+                    <Value>185</Value>
+                </MaximumHeartRateBpm>
+                <GearWeightKilograms>0.000000</GearWeightKilograms>
+                <HeartRateZones>
+                    <Number>1</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>93</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>111</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>2</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>111</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>130</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>3</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>130</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>148</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>4</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>148</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>167</Value>
+                    </High>
+                </HeartRateZones>
+                <HeartRateZones>
+                    <Number>5</Number>
+                    <ViewAs>Beats Per Minute</ViewAs>
+                    <Low xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>167</Value>
+                    </Low>
+                    <High xsi:type="HeartRateInBeatsPerMinute_t">
+                        <Value>185</Value>
+                    </High>
+                </HeartRateZones>
+                <SpeedZones>
+                    <Number>1</Number>
+                    <Name>1</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>1.072896</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>1.341120</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>2</Number>
+                    <Name>2</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>1.341120</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>1.676400</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>3</Number>
+                    <Name>3</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>1.577788</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>2.062000</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>4</Number>
+                    <Name>4</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>1.915000</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>2.438400</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>5</Number>
+                    <Name>5</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>2.235200</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>2.974900</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>6</Number>
+                    <Name>6</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>2.682240</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>3.352800</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>7</Number>
+                    <Name>7</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>2.974900</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>3.831771</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>8</Number>
+                    <Name>8</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>3.831771</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>5.364480</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>9</Number>
+                    <Name>9</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>5.364480</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>6.705600</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+                <SpeedZones>
+                    <Number>10</Number>
+                    <Name>10</Name>
+                    <Value xsi:type="CustomSpeedZone_t">
+                        <ViewAs>Speed</ViewAs>
+                        <LowInMetersPerSecond>6.705600</LowInMetersPerSecond>
+                        <HighInMetersPerSecond>8.940800</HighInMetersPerSecond>
+                    </Value>
+                </SpeedZones>
+            </Activities>
+        </Profile>
+    </Extensions>
+</TrainingCenterDatabase>
diff --git a/packages/libxml/examples/tree2.pas b/packages/libxml/examples/tree2.pas
index 090897e291..20870a7081 100644
--- a/packages/libxml/examples/tree2.pas
+++ b/packages/libxml/examples/tree2.pas
@@ -45,6 +45,7 @@ begin
    * of root_node node.
    *)
   xmlNewChild(root_node, nil, BAD_CAST('node1'), BAD_CAST('content of node 1'));
+
   (*
    * The same as above, but the new child node doesn't have a content
    *)
diff --git a/packages/libxml/src/libxml2.pas b/packages/libxml/src/libxml2.pas
index 442547dadb..8ce3cc31d5 100644
--- a/packages/libxml/src/libxml2.pas
+++ b/packages/libxml/src/libxml2.pas
@@ -278,6 +278,16 @@ end;
 
 
 (*
+ * macros from xmlversion.inc
+ *)
+
+function BAD_CAST(str: pchar): xmlCharPtr;
+begin
+  result := xmlCharPtr(str);
+end;
+
+
+(*
  * macros from chvalid.inc
  *)
 
diff --git a/packages/libxml/src/tree.inc b/packages/libxml/src/tree.inc
index 1143421f34..d58fc90cd2 100644
--- a/packages/libxml/src/tree.inc
+++ b/packages/libxml/src/tree.inc
@@ -768,15 +768,15 @@ function xmlReconciliateNs(doc: xmlDocPtr; tree: xmlNodePtr): cint; XMLCALL; XML
 (*
  * Saving.
  *)
-procedure xmlDocDumpFormatMemory(cur: xmlDocPtr; mem: xmlCharPtrPtr; size: pcint; format: cint); XMLCALL; XMLPUBFUN;
+procedure xmlDocDumpFormatMemory(cur: xmlDocPtr; var mem: xmlCharPtr; var size: cint; format: cint); XMLCALL; XMLPUBFUN;
 procedure xmlDocDumpMemory(cur: xmlDocPtr; var mem: xmlCharPtr; var size: cint); XMLCALL; XMLPUBFUN;
 procedure xmlDocDumpMemoryEnc(out_doc: xmlDocPtr; var doc_txt_ptr: xmlCharPtr; var doc_txt_len: cint; txt_encoding: pchar); XMLCALL; XMLPUBFUN;
-procedure xmlDocDumpFormatMemoryEnc(out_doc: xmlDocPtr; doc_txt_ptr: xmlCharPtrPtr; doc_txt_len: pcint; txt_encoding: pchar; format: cint); XMLCALL; XMLPUBFUN;
+procedure xmlDocDumpFormatMemoryEnc(out_doc: xmlDocPtr; var doc_txt_ptr: xmlCharPtr; var doc_txt_len: cint; txt_encoding: pchar; format: cint); XMLCALL; XMLPUBFUN;
 function xmlDocFormatDump(f: PFILE; cur: xmlDocPtr; format: cint): cint; XMLCALL; XMLPUBFUN;
 function xmlDocDump(f: PFILE; cur: xmlDocPtr): cint; XMLCALL; XMLPUBFUN;
 function xmlElemDump(f: PFILE; doc: xmlDocPtr; cur: xmlNodePtr): cint; XMLCALL; XMLPUBFUN;
-function xmlSaveFile(filename: pchar; cur: xmlDocPtr; format: cint): cint; XMLCALL; XMLPUBFUN;
-function xmlSaveFormatFile(filename: pchar; cur: xmlDocPtr): cint; XMLCALL; XMLPUBFUN;
+function xmlSaveFormatFile(filename: pchar; cur: xmlDocPtr; format: cint): cint; XMLCALL; XMLPUBFUN;
+function xmlSaveFile(filename: pchar; cur: xmlDocPtr): cint; XMLCALL; XMLPUBFUN;
 function xmlNodeDump(buf: xmlBufferPtr; doc: xmlDocPtr; cur: xmlNodePtr; level, format: cint): cint; XMLCALL; XMLPUBFUN;
 function xmlSaveFileTo(buf: xmlOutputBufferPtr; cur: xmlDocPtr; encoding: pchar): cint; XMLCALL; XMLPUBFUN;
 function xmlSaveFormatFileTo(buf: xmlOutputBufferPtr; cur: xmlDocPtr; encoding: pchar; format: cint): cint; XMLCALL; XMLPUBFUN;
diff --git a/packages/libxml/src/xmlstring.inc b/packages/libxml/src/xmlstring.inc
index ff45ff3bbe..f4200df4f1 100644
--- a/packages/libxml/src/xmlstring.inc
+++ b/packages/libxml/src/xmlstring.inc
@@ -24,14 +24,14 @@
   xmlChar = cchar;
 {$ENDIF}
 
+{$IFDEF FUNCTION}
 (**
  * BAD_CAST:
  *
  * Macro to cast a string to an xmlChar * when one know its safe.
  *)
-//#define BAD_CAST (xmlChar *)
+function BAD_CAST(str: pchar): xmlCharPtr; inline;
 
-{$IFDEF FUNCTION}
 (*
  * xmlChar handling
  *)
diff --git a/packages/libxml/src/xmlversion.inc b/packages/libxml/src/xmlversion.inc
index 37e09c000c..ee720c95f6 100644
--- a/packages/libxml/src/xmlversion.inc
+++ b/packages/libxml/src/xmlversion.inc
@@ -145,7 +145,8 @@ procedure LIBXML_TEST_VERSION;
  *
  * Whether the deprecated APIs are compiled in for compatibility
  *)
-{$DEFINE LIBXML_LEGACY_ENABLED}
+{.$DEFINE LIBXML_LEGACY_ENABLED}
+{$WARNING 'libxml legacy mode disabled!'}
 
 (**
  * LIBXML_C14N_ENABLED: