فهرست منبع

组件大小命名处理

CrazyIter 4 سال پیش
والد
کامیت
1d6dc0c919

+ 33 - 33
HTEXLib/Animations/AnimtimeGenerator.cs

@@ -115,11 +115,11 @@ namespace HTEXLib.Animations
                     Condition condition = commonTimeNode.StartConditionList.FirstChild as Condition;
                     if (condition != null) {
                         animtime.stCondLst = new TimeCond();
-                        animtime.stCondLst.Delay = condition.Delay != null &&!condition.Delay.Value .Equals("indefinite") ? int.Parse(condition.Delay.Value) : -1;
-                        animtime.stCondLst.Event = condition.Event != null ? condition.Event.Value.ToString() : "";
-                        animtime.stCondLst.TimeNodeVal = condition.TimeNode != null && condition.TimeNode.Val != null ? condition.TimeNode.Val.Value : 0;
-                        animtime.stCondLst.TargetElement = condition.TargetElement!=null ?DoTargetElement(condition.TargetElement):null;
-                        animtime.stCondLst.TrgrRtNode = condition.RuntimeNodeTrigger != null ? condition.RuntimeNodeTrigger.Val.ToString() : "";
+                        animtime.stCondLst.delay = condition.Delay != null &&!condition.Delay.Value .Equals("indefinite") ? int.Parse(condition.Delay.Value) : -1;
+                        animtime.stCondLst.@event = condition.Event != null ? condition.Event.Value.ToString() : "";
+                        animtime.stCondLst.timeNodeVal = condition.TimeNode != null && condition.TimeNode.Val != null ? condition.TimeNode.Val.Value : 0;
+                        animtime.stCondLst.targetElement = condition.TargetElement!=null ?DoTargetElement(condition.TargetElement):null;
+                        animtime.stCondLst.trgrRtNode = condition.RuntimeNodeTrigger != null ? condition.RuntimeNodeTrigger.Val.ToString() : "";
                     }
                 }
                 if (commonTimeNode.EndConditionList != null)
@@ -129,11 +129,11 @@ namespace HTEXLib.Animations
                     if (condition != null)
                     {
                         animtime.endCondLst = new TimeCond();
-                        animtime.endCondLst.Delay = condition.Delay != null && !condition.Delay.Value.Equals("indefinite") ? int.Parse(condition.Delay.Value) : -1;
-                        animtime.endCondLst.Event = condition.Event != null ? condition.Event.Value.ToString() : "";
-                        animtime.endCondLst.TimeNodeVal = condition.TimeNode != null && condition.TimeNode.Val != null ? condition.TimeNode.Val.Value : 0;
-                        animtime.endCondLst.TargetElement = condition.TargetElement != null ? DoTargetElement(condition.TargetElement) : null;
-                        animtime.endCondLst.TrgrRtNode = condition.RuntimeNodeTrigger != null ? condition.RuntimeNodeTrigger.Val.ToString() : "";
+                        animtime.endCondLst.delay = condition.Delay != null && !condition.Delay.Value.Equals("indefinite") ? int.Parse(condition.Delay.Value) : -1;
+                        animtime.endCondLst.@event = condition.Event != null ? condition.Event.Value.ToString() : "";
+                        animtime.endCondLst.timeNodeVal = condition.TimeNode != null && condition.TimeNode.Val != null ? condition.TimeNode.Val.Value : 0;
+                        animtime.endCondLst.targetElement = condition.TargetElement != null ? DoTargetElement(condition.TargetElement) : null;
+                        animtime.endCondLst.trgrRtNode = condition.RuntimeNodeTrigger != null ? condition.RuntimeNodeTrigger.Val.ToString() : "";
                     }
                 }
 
@@ -165,41 +165,41 @@ namespace HTEXLib.Animations
 
         public HTEXLib.Models.TargetElement DoTargetElement(DocumentFormat.OpenXml.Presentation.TargetElement tgt) {
             HTEXLib.Models.TargetElement TargetElement = new HTEXLib.Models.TargetElement { };
-            TargetElement.SlideTarget = tgt.SlideTarget != null ? "SlideTarget" : null;
+            TargetElement.slideTarget = tgt.SlideTarget != null ? "SlideTarget" : null;
             if (tgt.SoundTarget != null)
             {
-                TargetElement.SoundTarget = new HTEXLib.Models.EmbeddedWavAudioFileType();
-                TargetElement.SoundTarget.Embed = tgt.SoundTarget.Embed != null ? tgt.SoundTarget.Embed.Value : "";
-                TargetElement.SoundTarget.Name = tgt.SoundTarget.Name != null ? tgt.SoundTarget.Name.Value : "";
-                TargetElement.SoundTarget.BuiltIn = tgt.SoundTarget.BuiltIn != null ? tgt.SoundTarget.BuiltIn.Value : false;
+                TargetElement.soundTarget = new HTEXLib.Models.EmbeddedWavAudioFileType();
+                TargetElement.soundTarget.embed = tgt.SoundTarget.Embed != null ? tgt.SoundTarget.Embed.Value : "";
+                TargetElement.soundTarget.name = tgt.SoundTarget.Name != null ? tgt.SoundTarget.Name.Value : "";
+                TargetElement.soundTarget.builtIn = tgt.SoundTarget.BuiltIn != null ? tgt.SoundTarget.BuiltIn.Value : false;
             }
             if (tgt.InkTarget != null)
             {
-                TargetElement.InkTarget_ShapeId = tgt.InkTarget.ShapeId != null ? tgt.InkTarget.ShapeId.Value : "";
+                TargetElement.inkTargetShapeId = tgt.InkTarget.ShapeId != null ? tgt.InkTarget.ShapeId.Value : "";
             }
 
             if (tgt.BookmarkTarget != null)
             {
-                TargetElement.BookmarkName = tgt.BookmarkTarget.BookmarkName != null ? tgt.BookmarkTarget.BookmarkName.Value : "";
-                TargetElement.BookmarkTarget_ShapeId = tgt.BookmarkTarget.ShapeId != null ? tgt.BookmarkTarget.ShapeId.Value : 0;
+                TargetElement.bookmarkName = tgt.BookmarkTarget.BookmarkName != null ? tgt.BookmarkTarget.BookmarkName.Value : "";
+                TargetElement.bookmarkTargetShapeId = tgt.BookmarkTarget.ShapeId != null ? tgt.BookmarkTarget.ShapeId.Value : 0;
             }
             if (tgt.ShapeTarget != null)
             {
-                TargetElement.ShapeTarget = new HTEXLib.Models.ShapeTarget();
-                TargetElement.ShapeTarget.ShapeId = tgt.ShapeTarget.ShapeId != null ? tgt.ShapeTarget.ShapeId.Value : "";
-                TargetElement.ShapeTarget.SubShapeId = tgt.ShapeTarget.SubShape != null && tgt.ShapeTarget.SubShape.ShapeId != null ? tgt.ShapeTarget.SubShape.ShapeId.Value : "";
-                TargetElement.ShapeTarget.OleChartEl_Level = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Level != null ? tgt.ShapeTarget.OleChartElement.Level.Value : 0;
-                TargetElement.ShapeTarget.OleChartEl_Type = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Type != null ? tgt.ShapeTarget.OleChartElement.Type.Value.ToString() : "";
-                TargetElement.ShapeTarget.TxEl_charRg_Start = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.Start != null ? tgt.ShapeTarget.TextElement.CharRange.Start.Value : 0;
-                TargetElement.ShapeTarget.TxEl_charRg_End = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.End != null ? tgt.ShapeTarget.TextElement.CharRange.End.Value : 0;
-                TargetElement.ShapeTarget.TxEl_pRg_Start = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start.Value : 0;
-                TargetElement.ShapeTarget.TxEl_pRg_End = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.End.Value : 0;
-                TargetElement.ShapeTarget.Bg = tgt.ShapeTarget.BackgroundAnimation != null ? "bg" : "";
-                TargetElement.ShapeTarget.GraphicEl_Diagram_Id = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.Id != null ? tgt.ShapeTarget.GraphicElement.Diagram.Id.Value : "";
-                TargetElement.ShapeTarget.GraphicEl_Diagram_BuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Diagram.BuildStep.Value.ToString() : "";
-                TargetElement.ShapeTarget.GraphicEl_Chart_SeriesIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex.Value : -1;
-                TargetElement.ShapeTarget.GraphicEl_Chart_CategoryIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex.Value : -1;
-                TargetElement.ShapeTarget.GraphicEl_Chart_BuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Chart.BuildStep.Value.ToString() : "";
+                TargetElement.shapeTarget = new HTEXLib.Models.ShapeTarget();
+                TargetElement.shapeTarget.shapeId = tgt.ShapeTarget.ShapeId != null ? tgt.ShapeTarget.ShapeId.Value : "";
+                TargetElement.shapeTarget.subShapeId = tgt.ShapeTarget.SubShape != null && tgt.ShapeTarget.SubShape.ShapeId != null ? tgt.ShapeTarget.SubShape.ShapeId.Value : "";
+                TargetElement.shapeTarget.oleChartElLevel = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Level != null ? tgt.ShapeTarget.OleChartElement.Level.Value : 0;
+                TargetElement.shapeTarget.oleChartElType = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Type != null ? tgt.ShapeTarget.OleChartElement.Type.Value.ToString() : "";
+                TargetElement.shapeTarget.txElCharRgStart = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.Start != null ? tgt.ShapeTarget.TextElement.CharRange.Start.Value : 0;
+                TargetElement.shapeTarget.txElCharRgEnd = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.End != null ? tgt.ShapeTarget.TextElement.CharRange.End.Value : 0;
+                TargetElement.shapeTarget.txElPRgStart = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start.Value : 0;
+                TargetElement.shapeTarget.txElPRgEnd = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.End.Value : 0;
+                TargetElement.shapeTarget.bg = tgt.ShapeTarget.BackgroundAnimation != null ? "bg" : "";
+                TargetElement.shapeTarget.graphicElDiagramId = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.Id != null ? tgt.ShapeTarget.GraphicElement.Diagram.Id.Value : "";
+                TargetElement.shapeTarget.graphicElDiagramBuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Diagram.BuildStep.Value.ToString() : "";
+                TargetElement.shapeTarget.graphicElChartSeriesIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex.Value : -1;
+                TargetElement.shapeTarget.graphicElChartCategoryIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex.Value : -1;
+                TargetElement.shapeTarget.graphicElChartBuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Chart.BuildStep.Value.ToString() : "";
             }
             return TargetElement;
         }

+ 13 - 13
HTEXLib/Helpers/ShapeHelpers/PPTXHelper.cs

@@ -299,13 +299,13 @@ namespace HTEXLib.Helpers.ShapeHelpers
             var EffectList = shapeProperties.GetFirstChild<EffectList>();
             var EffectDag = shapeProperties.GetFirstChild<EffectDag>();
             var ShapePropertiesExtensionList = shapeProperties.GetFirstChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            tbStyle.RightToLeft = shapeProperties.RightToLeft != null? shapeProperties.RightToLeft.Value:false;
-            tbStyle.FirstRow = shapeProperties.FirstRow != null ? shapeProperties.FirstRow.Value : false;
-            tbStyle.FirstColumn = shapeProperties.FirstColumn != null ? shapeProperties.FirstColumn.Value : false;
-            tbStyle.LastRow = shapeProperties.LastRow != null ? shapeProperties.LastRow.Value : false;
-            tbStyle.LastColumn = shapeProperties.LastColumn != null ? shapeProperties.LastColumn.Value : false;
-            tbStyle.BandRow = shapeProperties.BandRow != null ? shapeProperties.BandRow.Value : false;
-            tbStyle.BandColumn = shapeProperties.BandColumn != null ? shapeProperties.BandColumn.Value : false;
+            tbStyle.rightToLeft = shapeProperties.RightToLeft != null? shapeProperties.RightToLeft.Value:false;
+            tbStyle.firstRow = shapeProperties.FirstRow != null ? shapeProperties.FirstRow.Value : false;
+            tbStyle.firstColumn = shapeProperties.FirstColumn != null ? shapeProperties.FirstColumn.Value : false;
+            tbStyle.lastRow = shapeProperties.LastRow != null ? shapeProperties.LastRow.Value : false;
+            tbStyle.lastColumn = shapeProperties.LastColumn != null ? shapeProperties.LastColumn.Value : false;
+            tbStyle.bandRow = shapeProperties.BandRow != null ? shapeProperties.BandRow.Value : false;
+            tbStyle.bandColumn = shapeProperties.BandColumn != null ? shapeProperties.BandColumn.Value : false;
             return tbStyle;
         }
 
@@ -1111,7 +1111,7 @@ namespace HTEXLib.Helpers.ShapeHelpers
             //20.1.10.35     EMUs. 1 pt = 12700 EMUs.
             double? Width = null;
             if (outline == null && Shapetype== "CxnSp") {
-               return new Border { outline =new HtexOutline { Width=0.5} ,type= "solid",stroke="0" };
+               return new Border { outline =new HtexOutline { width=0.5} ,type= "solid",stroke="0" };
             }
             if (outline.Width != null)
             {
@@ -1152,7 +1152,7 @@ namespace HTEXLib.Helpers.ShapeHelpers
             if (outline.CapType != null) {
                 cap = outline.CapType;
             }
-            border.outline = new HtexOutline { Width = Width, algn = algn, cmpd = cmpd, cap = cap };
+            border.outline = new HtexOutline { width = Width, algn = algn, cmpd = cmpd, cap = cap };
             var gradFill = outline.GetFirstChild<GradientFill>();
             if (gradFill != null)
             {
@@ -1219,8 +1219,8 @@ namespace HTEXLib.Helpers.ShapeHelpers
                 border.type = type;
                 border.stroke = stroke;
             }
-            if (border.color != null && (border.color.type !=null || border.color.type !=1) && border.outline.Width==null) {
-                border.outline.Width = 1;
+            if (border.color != null && (border.color.type !=null || border.color.type !=1) && border.outline.width==null) {
+                border.outline.width = 1;
                 if (border.type == null) {
                     border.type = "solid";
                     border.stroke = "0";
@@ -1389,8 +1389,8 @@ namespace HTEXLib.Helpers.ShapeHelpers
             {
                 colors.Add(new ColorPosition
                 {
-                    Color = ColorTypeColors(gradientStop, slide),
-                    Position = gradientStop.Position *1.0/ 1000 /// 位置,色带的位置 百分比0-100
+                    color = ColorTypeColors(gradientStop, slide),
+                    position = gradientStop.Position *1.0/ 1000 /// 位置,色带的位置 百分比0-100
                 });
             }
             gradientFill.colors = colors;

+ 29 - 29
HTEXLib/Models/Animtime.cs

@@ -143,39 +143,39 @@ namespace HTEXLib.Models
         /// OnStopAudio = 11,
         /// OnMediaBookmark = 12
         /// </summary>
-        public string Event { get; set; }
-        public int Delay { get; set; }
-        public TargetElement TargetElement { get; set; }
+        public string @event { get; set; }
+        public int delay { get; set; }
+        public TargetElement targetElement { get; set; }
 
-        public UInt32 TimeNodeVal { get; set; }
+        public UInt32 timeNodeVal { get; set; }
         /// <summary>
         /// First = 0,
         /// Last = 1,
         /// All = 2
         /// </summary>
-        public string TrgrRtNode { get; set; }
+        public string trgrRtNode { get; set; }
     }
 
     public class TargetElement
     {
-        public string SlideTarget { get; set; }
-        public EmbeddedWavAudioFileType SoundTarget { get; set; }
-        public ShapeTarget ShapeTarget { get; set; }
-        public string InkTarget_ShapeId { get; set; }
-        public UInt32 BookmarkTarget_ShapeId { get; set; }
-        public string BookmarkName { get; set; }
+        public string slideTarget { get; set; }
+        public EmbeddedWavAudioFileType soundTarget { get; set; }
+        public ShapeTarget shapeTarget { get; set; }
+        public string inkTargetShapeId { get; set; }
+        public UInt32 bookmarkTargetShapeId { get; set; }
+        public string bookmarkName { get; set; }
     }
     public class EmbeddedWavAudioFileType {
-        public string Embed { get; set; }
-        public string Name { get; set; }
-        public bool BuiltIn { get; set; }
-        public string Url { get; set; }
+        public string embed { get; set; }
+        public string name { get; set; }
+        public bool builtIn { get; set; }
+        public string url { get; set; }
     }
     public  class ShapeTarget
     {
-        public string ShapeId { get; set; }
-        public string SubShapeId { get; set; }
-        public UInt32 OleChartEl_Level { get; set; }
+        public string shapeId { get; set; }
+        public string subShapeId { get; set; }
+        public UInt32 oleChartElLevel { get; set; }
         /// <summary>
         ///Grid Legend ).
         ///gridLegend".
@@ -193,21 +193,21 @@ namespace HTEXLib.Models
         ///ptInCategory".
         ///PointInCategory = 4
         /// </summary>
-        public string OleChartEl_Type { get; set; }
+        public string oleChartElType { get; set; }
 
-        public UInt32 TxEl_charRg_Start { get; set; }
-        public UInt32 TxEl_charRg_End { get; set; }
-        public UInt32 TxEl_pRg_Start { get; set; }
-        public UInt32 TxEl_pRg_End { get; set; }
-        public string Bg { get; set; } = null;
+        public UInt32 txElCharRgStart { get; set; }
+        public UInt32 txElCharRgEnd { get; set; }
+        public UInt32 txElPRgStart { get; set; }
+        public UInt32 txElPRgEnd { get; set; }
+        public string bg { get; set; } = null;
 
-        public string GraphicEl_Diagram_Id { get; set; }
+        public string graphicElDiagramId { get; set; }
         /// <summary>
         /// Shape 0 sp   Background  1  bg
         /// </summary>
-        public string GraphicEl_Diagram_BuildStep { get; set; }
-        public int  GraphicEl_Chart_SeriesIndex { get; set; }
-        public int GraphicEl_Chart_CategoryIndex { get; set; }
+        public string graphicElDiagramBuildStep { get; set; }
+        public int  graphicElChartSeriesIndex { get; set; }
+        public int graphicElChartCategoryIndex { get; set; }
         /// <summary>
         ///
         ///"category".
@@ -228,7 +228,7 @@ namespace HTEXLib.Models
         ///"gridLegend".
         ///GridLegend = 5
         /// </summary>
-        public string GraphicEl_Chart_BuildStep { get; set; }
+        public string graphicElChartBuildStep { get; set; }
         
     }
 }

+ 1 - 1
HTEXLib/Models/Border.cs

@@ -32,7 +32,7 @@ namespace HTEXLib
     }
     public class HtexOutline
     {
-        public double? Width { get; set; }
+        public double? width { get; set; }
         /// <summary>
         ///  Center = 0,
         ///Insert = 1

+ 2 - 2
HTEXLib/Models/Fill.cs

@@ -120,8 +120,8 @@ namespace HTEXLib
     }
     public class ColorPosition
     {
-        public string Color { get; set; }
-        public double Position { get; set; }
+        public string color { get; set; }
+        public double position { get; set; }
     }
     /// <summary>
     /// 偏移向量

+ 1 - 1
HTEXLib/Models/HTEX/HtexTable.cs

@@ -38,7 +38,7 @@ namespace HTEXLib.Models.HTEX
             Position position = new Position { cx = width, cy = height, x = left, y = top, rot = rot };
             TbStyle tbStyle = PPTXHelper.DoTableProperties(Table.TableProperties, slide, type, partForm);
             List<GridColumn> columns = Table.TableGrid.Elements<GridColumn>().ToList();
-            tbStyle.ColumnWidth = columns.Select(x => x.Width * Globals.px96 * 1.0 / Globals.px914400).ToList();
+            tbStyle.columnWidth = columns.Select(x => x.Width * Globals.px96 * 1.0 / Globals.px914400).ToList();
             List<TableRow> rows = Table.Elements<TableRow>().ToList();
             var trs = DoTableRow(rows, slide, type, partForm);
             Table table = new Table() { sid = sid,id = this.id, tr = trs, style = tbStyle, type =type, index = index, /*animatable = animatable, invisible = invisible */};

+ 119 - 119
HTEXLib/Models/PPTX/PPTSlide.cs

@@ -243,9 +243,9 @@ namespace HTEXLib.Models
                     timeNodes.Add(new Sequence
                     {
                         type= "sequence",
-                        Concurrent = sequence.Concurrent != null ? sequence.Concurrent.Value : false,
-                        PreviousAction = sequence.PreviousAction != null ? sequence.PreviousAction.Value.ToString() : "none",
-                        NextAction = sequence.NextAction != null ? sequence.NextAction.Value.ToString() : "none",
+                        concurrent = sequence.Concurrent != null ? sequence.Concurrent.Value : false,
+                        previousAction = sequence.PreviousAction != null ? sequence.PreviousAction.Value.ToString() : "none",
+                        nextAction = sequence.NextAction != null ? sequence.NextAction.Value.ToString() : "none",
                     })                    ;
 
                 }
@@ -257,9 +257,9 @@ namespace HTEXLib.Models
                 {
                     
                     Anim anim = new Anim() { type= "anim" };
-                    anim.By = animate.By!=null?animate.By.Value:"";
-                    anim.From = animate.From != null ? animate.From.Value : "";
-                    anim.To = animate.To != null ? animate.To.Value : "";
+                    anim.by = animate.By!=null?animate.By.Value:"";
+                    anim.from = animate.From != null ? animate.From.Value : "";
+                    anim.to = animate.To != null ? animate.To.Value : "";
                     anim.calcmode = animate.CalculationMode != null ? animate.CalculationMode.Value.ToString() : "";
                     anim.valueType = animate.ValueType != null ? animate.ValueType.Value.ToString() : "";
                     anim.bounceEnd = animate.BounceEnd != null ? animate.BounceEnd.Value : -1;
@@ -268,17 +268,17 @@ namespace HTEXLib.Models
                         anim.timeAnimate = new List<TimeAnimate>();
                         foreach (TimeAnimateValue timeAnimateValue in list) {
                             TimeAnimate timeAnimate = new TimeAnimate();
-                            timeAnimate.Time = timeAnimateValue.Time!=null? timeAnimateValue.Time.Value:"";
-                            timeAnimate.Fomula = timeAnimateValue.Fomula!=null?timeAnimateValue.Fomula.Value:"";
+                            timeAnimate.time = timeAnimateValue.Time!=null? timeAnimateValue.Time.Value:"";
+                            timeAnimate.fomula = timeAnimateValue.Fomula!=null?timeAnimateValue.Fomula.Value:"";
                             if (timeAnimateValue.VariantValue != null) {
                                 var val=  timeAnimateValue.VariantValue;
-                                timeAnimate.VariantValue = new Val();
-                                timeAnimate.VariantValue.boolVal = val.BooleanVariantValue != null ? val.BooleanVariantValue.Val.Value : false;
-                                timeAnimate.VariantValue.intVal = val.IntegerVariantValue != null ? val.IntegerVariantValue.Val.Value : -1;
-                                timeAnimate.VariantValue.fltVal = val.FloatVariantValue != null ? val.FloatVariantValue.Val.Value : -1;
-                                timeAnimate.VariantValue.strVal = val.StringVariantValue != null ? val.StringVariantValue.Val.Value : "";
+                                timeAnimate.variantValue = new Val();
+                                timeAnimate.variantValue.boolVal = val.BooleanVariantValue != null ? val.BooleanVariantValue.Val.Value : false;
+                                timeAnimate.variantValue.intVal = val.IntegerVariantValue != null ? val.IntegerVariantValue.Val.Value : -1;
+                                timeAnimate.variantValue.fltVal = val.FloatVariantValue != null ? val.FloatVariantValue.Val.Value : -1;
+                                timeAnimate.variantValue.strVal = val.StringVariantValue != null ? val.StringVariantValue.Val.Value : "";
                                 if (val.ColorValue != null) {
-                                    timeAnimate.VariantValue.clrVal= DoColorType(val.ColorValue);
+                                    timeAnimate.variantValue.clrVal= DoColorType(val.ColorValue);
                                 }
                             }
                             anim.timeAnimate.Add(timeAnimate);
@@ -290,28 +290,28 @@ namespace HTEXLib.Models
                 if (element is DocumentFormat.OpenXml.Presentation.AnimateColor animateColor)
                 {
                     AnimClr animClr = new AnimClr() { type= "animClr" };
-                    animClr.ColorSpace = animateColor.ColorSpace != null ? animateColor.ColorSpace.Value.ToString() : "";
-                    animClr.Direction = animateColor.Direction != null ? animateColor.Direction.Value.ToString() : "";
+                    animClr.colorSpace = animateColor.ColorSpace != null ? animateColor.ColorSpace.Value.ToString() : "";
+                    animClr.direction = animateColor.Direction != null ? animateColor.Direction.Value.ToString() : "";
                     if (animateColor.ByColor != null) {
                         if (animateColor.ByColor.HslColor!=null) {
-                            animClr .ByColor= ReadColor(animateColor.ByColor.HslColor.Hue, animateColor.ByColor.HslColor.Saturation, animateColor.ByColor.HslColor.Lightness);
+                            animClr .byColor= ReadColor(animateColor.ByColor.HslColor.Hue, animateColor.ByColor.HslColor.Saturation, animateColor.ByColor.HslColor.Lightness);
                         }
                         if (animateColor.ByColor.RgbColor != null) {
                             int r = animateColor.ByColor.RgbColor.Red;
                             int g = animateColor.ByColor.RgbColor.Green;
                             int b = animateColor.ByColor.RgbColor.Blue;
-                            animClr.ByColor = System.Drawing.ColorTranslator.ToHtml(Color.FromArgb(r, g, b));
+                            animClr.byColor = System.Drawing.ColorTranslator.ToHtml(Color.FromArgb(r, g, b));
                         }
                     }
                     if (animateColor.FromColor != null)
                     {
                         Color3Type color3Type = animateColor.FromColor;
-                        animClr.FromColor= DoColor3Type( color3Type);
+                        animClr.fromColor= DoColor3Type( color3Type);
                     }
                     if (animateColor.ToColor != null)
                     {
                         Color3Type color3Type = animateColor.ToColor;
-                        animClr.FromColor = DoColor3Type(color3Type);
+                        animClr.fromColor = DoColor3Type(color3Type);
                     }
                     
                     animClr.behavior = DoCommonBehavior(animateColor.CommonBehavior);
@@ -329,26 +329,26 @@ namespace HTEXLib.Models
                 if (element is AnimateMotion animateMotion)
                 {
                     AnimMotion animMotion = new AnimMotion() {type= "animMotion" };
-                    animMotion.Origin = animateMotion.Origin != null ? animateMotion.Origin.Value.ToString() : "";
-                    animMotion.Path = animateMotion.Path != null ? animateMotion.Path.Value : "";
-                    animMotion.PathEditMode = animateMotion.PathEditMode != null ? animateMotion.PathEditMode.Value.ToString() : "";
-                    animMotion.RelativeAngle = animateMotion.RelativeAngle != null ? animateMotion.RelativeAngle.Value  : -1;
-                    animMotion.PointTypes = animateMotion.PointTypes != null ? animateMotion.PointTypes.Value : "";
-                    animMotion.BounceEnd = animateMotion.BounceEnd != null ? animateMotion.BounceEnd.Value : -1;
+                    animMotion.origin = animateMotion.Origin != null ? animateMotion.Origin.Value.ToString() : "";
+                    animMotion.path = animateMotion.Path != null ? animateMotion.Path.Value : "";
+                    animMotion.pathEditMode = animateMotion.PathEditMode != null ? animateMotion.PathEditMode.Value.ToString() : "";
+                    animMotion.relativeAngle = animateMotion.RelativeAngle != null ? animateMotion.RelativeAngle.Value  : -1;
+                    animMotion.pointTypes = animateMotion.PointTypes != null ? animateMotion.PointTypes.Value : "";
+                    animMotion.bounceEnd = animateMotion.BounceEnd != null ? animateMotion.BounceEnd.Value : -1;
                     if (animateMotion.ByPosition != null) {
-                        animMotion.ByPosition = new MotionPathAnimation.PathPoint { X = animateMotion.ByPosition.X, Y = animateMotion.ByPosition.Y };
+                        animMotion.byPosition = new MotionPathAnimation.PathPoint { X = animateMotion.ByPosition.X, Y = animateMotion.ByPosition.Y };
                     }
                     if (animateMotion.FromPosition != null)
                     {
-                        animMotion.FromPosition = new MotionPathAnimation.PathPoint { X = animateMotion.FromPosition.X, Y = animateMotion.FromPosition.Y };
+                        animMotion.fromPosition = new MotionPathAnimation.PathPoint { X = animateMotion.FromPosition.X, Y = animateMotion.FromPosition.Y };
                     }
                     if (animateMotion.ToPosition != null)
                     {
-                        animMotion.ToPosition = new MotionPathAnimation.PathPoint { X = animateMotion.ToPosition.X, Y = animateMotion.ToPosition.Y };
+                        animMotion.toPosition = new MotionPathAnimation.PathPoint { X = animateMotion.ToPosition.X, Y = animateMotion.ToPosition.Y };
                     }
                     if (animateMotion.RotationCenter != null)
                     {
-                        animMotion.RotationCenter = new MotionPathAnimation.PathPoint { X = animateMotion.RotationCenter.X, Y = animateMotion.RotationCenter.Y };
+                        animMotion.rotationCenter = new MotionPathAnimation.PathPoint { X = animateMotion.RotationCenter.X, Y = animateMotion.RotationCenter.Y };
                     }
                     animMotion.behavior = DoCommonBehavior(animateMotion.CommonBehavior);
                     timeNodes.Add(animMotion);
@@ -356,10 +356,10 @@ namespace HTEXLib.Models
                 if (element is AnimateRotation animateRotation)
                 {
                     AnimRot animRot = new AnimRot { type = "animRot" };
-                    animRot.By = animateRotation.By != null ? animateRotation.By.Value/60000 : -1;
-                    animRot.From = animateRotation.From != null ? animateRotation.From.Value/ 60000 : -1;
-                    animRot.To = animateRotation.To != null ? animateRotation.To.Value/ 60000 : -1;
-                    animRot.BounceEnd = animateRotation.BounceEnd != null ? animateRotation.BounceEnd.Value / 60000 : -1;
+                    animRot.by = animateRotation.By != null ? animateRotation.By.Value/60000 : -1;
+                    animRot.from = animateRotation.From != null ? animateRotation.From.Value/ 60000 : -1;
+                    animRot.to = animateRotation.To != null ? animateRotation.To.Value/ 60000 : -1;
+                    animRot.bounceEnd = animateRotation.BounceEnd != null ? animateRotation.BounceEnd.Value / 60000 : -1;
                     animRot.behavior = DoCommonBehavior(animateRotation.CommonBehavior);
                     timeNodes.Add(animRot);
 
@@ -370,18 +370,18 @@ namespace HTEXLib.Models
                     AnimScale animScale = new AnimScale { type = "animScale" };
                     if (animateScale.ByPosition != null)
                     {
-                        animScale.ByPosition = new MotionPathAnimation.PathPoint { X = animateScale.ByPosition.X, Y = animateScale.ByPosition.Y };
+                        animScale.byPosition = new MotionPathAnimation.PathPoint { X = animateScale.ByPosition.X, Y = animateScale.ByPosition.Y };
                     }
                     if (animateScale.FromPosition != null)
                     {
-                        animScale.FromPosition = new MotionPathAnimation.PathPoint { X = animateScale.FromPosition.X, Y = animateScale.FromPosition.Y };
+                        animScale.fromPosition = new MotionPathAnimation.PathPoint { X = animateScale.FromPosition.X, Y = animateScale.FromPosition.Y };
                     }
                     if (animateScale.ToPosition != null)
                     {
-                        animScale.ToPosition = new MotionPathAnimation.PathPoint { X = animateScale.ToPosition.X, Y = animateScale.ToPosition.Y };
+                        animScale.toPosition = new MotionPathAnimation.PathPoint { X = animateScale.ToPosition.X, Y = animateScale.ToPosition.Y };
                     }
-                    animScale.BounceEnd = animateScale.BounceEnd != null ? animateScale.BounceEnd.Value : -1;
-                    animScale.ZoomContents = animateScale.ZoomContents != null ? animateScale.ZoomContents.Value : false;
+                    animScale.bounceEnd = animateScale.BounceEnd != null ? animateScale.BounceEnd.Value : -1;
+                    animScale.zoomContents = animateScale.ZoomContents != null ? animateScale.ZoomContents.Value : false;
                     animScale.behavior = DoCommonBehavior(animateScale.CommonBehavior);
                     timeNodes.Add(animScale);
                 }
@@ -395,15 +395,15 @@ namespace HTEXLib.Models
                     Set set = new Set { type = "set" };
 
                     if (behavior.ToVariantValue != null) {
-                        set.ToVariantValue = new Val();
+                        set.toVariantValue = new Val();
                         var val = behavior.ToVariantValue;
-                        set.ToVariantValue.boolVal = val.BooleanVariantValue != null ? val.BooleanVariantValue.Val.Value : false;
-                        set.ToVariantValue.intVal = val.IntegerVariantValue != null ? val.IntegerVariantValue.Val.Value : -1;
-                        set.ToVariantValue.fltVal = val.FloatVariantValue != null ? val.FloatVariantValue.Val.Value : -1;
-                        set.ToVariantValue.strVal = val.StringVariantValue != null ? val.StringVariantValue.Val.Value : "";
+                        set.toVariantValue.boolVal = val.BooleanVariantValue != null ? val.BooleanVariantValue.Val.Value : false;
+                        set.toVariantValue.intVal = val.IntegerVariantValue != null ? val.IntegerVariantValue.Val.Value : -1;
+                        set.toVariantValue.fltVal = val.FloatVariantValue != null ? val.FloatVariantValue.Val.Value : -1;
+                        set.toVariantValue.strVal = val.StringVariantValue != null ? val.StringVariantValue.Val.Value : "";
                         if (val.ColorValue != null)
                         {
-                            set.ToVariantValue.clrVal = DoColorType(val.ColorValue);
+                            set.toVariantValue.clrVal = DoColorType(val.ColorValue);
                         }
                     }
                     set.behavior = DoCommonBehavior(behavior.CommonBehavior);
@@ -413,16 +413,16 @@ namespace HTEXLib.Models
                 if (element is DocumentFormat.OpenXml.Presentation.Audio audio)
                 {
                     Audio Audio = new Audio { type = "audio" };
-                    Audio.IsNarration = audio.IsNarration != null ? audio.IsNarration.Value : false;
-                    Audio.CommonMediaNode = audio.CommonMediaNode != null ? DoMediaNode(audio.CommonMediaNode,partForm): null;
+                    Audio.isNarration = audio.IsNarration != null ? audio.IsNarration.Value : false;
+                    Audio.commonMediaNode = audio.CommonMediaNode != null ? DoMediaNode(audio.CommonMediaNode,partForm): null;
                    
                     timeNodes.Add(Audio);
                 }
                 if (element is DocumentFormat.OpenXml.Presentation.Video video)
                 {
                     Video Video = new Video() { type = "video" };
-                    Video.FullScreen = video.FullScreen != null ? video.FullScreen.Value : false;
-                    Video.CommonMediaNode = video.CommonMediaNode != null ? DoMediaNode(video.CommonMediaNode,partForm) : null;
+                    Video.fullScreen = video.FullScreen != null ? video.FullScreen.Value : false;
+                    Video.commonMediaNode = video.CommonMediaNode != null ? DoMediaNode(video.CommonMediaNode,partForm) : null;
                     timeNodes.Add(Video);
                 }
             }
@@ -432,14 +432,14 @@ namespace HTEXLib.Models
         private Behavior DoCommonBehavior(CommonBehavior commonBehavior)
         {
             Behavior behavior = new Behavior();
-            behavior.Additive = commonBehavior.Additive != null ? commonBehavior.Additive.Value.ToString(): "";
-            behavior.TransformType = commonBehavior.TransformType != null ? commonBehavior.TransformType.Value.ToString() : "";
-            behavior.Accumulate = commonBehavior.Accumulate != null ? commonBehavior.Accumulate.Value.ToString():"";
-            behavior.From = commonBehavior.From != null ? commonBehavior.From.Value : "";
-            behavior.To = commonBehavior.To != null ? commonBehavior.To.Value : "";
-            behavior.By = commonBehavior.By != null ? commonBehavior.By.Value : "";
-            behavior.RuntimeContext = commonBehavior.RuntimeContext != null ? commonBehavior.RuntimeContext.Value : "";
-            behavior.TargetElement = DoTargetElement(commonBehavior.TargetElement);
+            behavior.additive = commonBehavior.Additive != null ? commonBehavior.Additive.Value.ToString(): "";
+            behavior.transformType = commonBehavior.TransformType != null ? commonBehavior.TransformType.Value.ToString() : "";
+            behavior.accumulate = commonBehavior.Accumulate != null ? commonBehavior.Accumulate.Value.ToString():"";
+            behavior.from = commonBehavior.From != null ? commonBehavior.From.Value : "";
+            behavior.to = commonBehavior.To != null ? commonBehavior.To.Value : "";
+            behavior.by = commonBehavior.By != null ? commonBehavior.By.Value : "";
+            behavior.runtimeContext = commonBehavior.RuntimeContext != null ? commonBehavior.RuntimeContext.Value : "";
+            behavior.targetElement = DoTargetElement(commonBehavior.TargetElement);
             if (commonBehavior.AttributeNameList != null) {
                 List<string> attrName = new List<string>();
                 var AttributeNames = commonBehavior.AttributeNameList.Elements<AttributeName>();
@@ -447,18 +447,18 @@ namespace HTEXLib.Models
                     attrName.Add(att.InnerText);
                 }
                 if (attrName.Count > 0) {
-                    behavior.AttrNames = attrName;
+                    behavior.attrNames = attrName;
                 }
             }
             if (commonBehavior.CommonTimeNode != null) {
-                behavior.Ctn = new Ctn();
-                behavior.Ctn.id = commonBehavior.CommonTimeNode.Id!=null ?  commonBehavior.CommonTimeNode.Id.Value:0;
-                behavior.Ctn.accel = commonBehavior.CommonTimeNode.Acceleration != null ? commonBehavior.CommonTimeNode.Acceleration.Value : 0;
-                behavior.Ctn.decel = commonBehavior.CommonTimeNode.Deceleration != null ? commonBehavior.CommonTimeNode.Deceleration.Value : 0;
-                behavior.Ctn.autoRev = commonBehavior.CommonTimeNode.AutoReverse != null ? commonBehavior.CommonTimeNode.AutoReverse.Value : false;
-                behavior.Ctn.dur = commonBehavior.CommonTimeNode.Duration != null ? commonBehavior.CommonTimeNode.Duration.Value : "";
-                behavior.Ctn.fill = commonBehavior.CommonTimeNode.Fill != null ? commonBehavior.CommonTimeNode.Fill.Value.ToString() : "";
-                behavior.Ctn.tmFilter = commonBehavior.CommonTimeNode.TimeFilter != null ? commonBehavior.CommonTimeNode.TimeFilter.Value : "";
+                behavior.ctn = new Ctn();
+                behavior.ctn.id = commonBehavior.CommonTimeNode.Id!=null ?  commonBehavior.CommonTimeNode.Id.Value:0;
+                behavior.ctn.accel = commonBehavior.CommonTimeNode.Acceleration != null ? commonBehavior.CommonTimeNode.Acceleration.Value : 0;
+                behavior.ctn.decel = commonBehavior.CommonTimeNode.Deceleration != null ? commonBehavior.CommonTimeNode.Deceleration.Value : 0;
+                behavior.ctn.autoRev = commonBehavior.CommonTimeNode.AutoReverse != null ? commonBehavior.CommonTimeNode.AutoReverse.Value : false;
+                behavior.ctn.dur = commonBehavior.CommonTimeNode.Duration != null ? commonBehavior.CommonTimeNode.Duration.Value : "";
+                behavior.ctn.fill = commonBehavior.CommonTimeNode.Fill != null ? commonBehavior.CommonTimeNode.Fill.Value.ToString() : "";
+                behavior.ctn.tmFilter = commonBehavior.CommonTimeNode.TimeFilter != null ? commonBehavior.CommonTimeNode.TimeFilter.Value : "";
             }
             if (commonBehavior.CommonTimeNode.StartConditionList != null)
             {
@@ -466,7 +466,7 @@ namespace HTEXLib.Models
                 Condition condition = commonBehavior.CommonTimeNode.StartConditionList.FirstChild as Condition;
                 if (condition != null)
                 {
-                    behavior.Ctn.delay = condition.Delay != null && !condition.Delay.Value.Equals("indefinite") ? int.Parse(condition.Delay.Value) : -1;
+                    behavior.ctn.delay = condition.Delay != null && !condition.Delay.Value.Equals("indefinite") ? int.Parse(condition.Delay.Value) : -1;
                 }
             }
             return behavior;
@@ -475,60 +475,60 @@ namespace HTEXLib.Models
         public HTEXLib.Models.TargetElement DoTargetElement(DocumentFormat.OpenXml.Presentation.TargetElement tgt)
         {
             HTEXLib.Models.TargetElement TargetElement = new HTEXLib.Models.TargetElement { };
-            TargetElement.SlideTarget = tgt.SlideTarget != null ? "SlideTarget" : null;
+            TargetElement.slideTarget = tgt.SlideTarget != null ? "SlideTarget" : null;
             if (tgt.SoundTarget != null)
             {
-                TargetElement.SoundTarget = new HTEXLib.Models.EmbeddedWavAudioFileType();
-                TargetElement.SoundTarget.Embed = tgt.SoundTarget.Embed != null ? tgt.SoundTarget.Embed.Value : "";
-                TargetElement.SoundTarget.Name = tgt.SoundTarget.Name != null ? tgt.SoundTarget.Name.Value : "";
-                TargetElement.SoundTarget.BuiltIn = tgt.SoundTarget.BuiltIn != null ? tgt.SoundTarget.BuiltIn.Value : false;
+                TargetElement.soundTarget = new HTEXLib.Models.EmbeddedWavAudioFileType();
+                TargetElement.soundTarget.embed = tgt.SoundTarget.Embed != null ? tgt.SoundTarget.Embed.Value : "";
+                TargetElement.soundTarget.name = tgt.SoundTarget.Name != null ? tgt.SoundTarget.Name.Value : "";
+                TargetElement.soundTarget.builtIn = tgt.SoundTarget.BuiltIn != null ? tgt.SoundTarget.BuiltIn.Value : false;
             }
             if (tgt.InkTarget != null)
             {
-                TargetElement.InkTarget_ShapeId = tgt.InkTarget.ShapeId != null ? tgt.InkTarget.ShapeId.Value : "";
+                TargetElement.inkTargetShapeId = tgt.InkTarget.ShapeId != null ? tgt.InkTarget.ShapeId.Value : "";
             }
 
             if (tgt.BookmarkTarget != null)
             {
-                TargetElement.BookmarkName = tgt.BookmarkTarget.BookmarkName != null ? tgt.BookmarkTarget.BookmarkName.Value : "";
-                TargetElement.BookmarkTarget_ShapeId = tgt.BookmarkTarget.ShapeId != null ? tgt.BookmarkTarget.ShapeId.Value : 0;
+                TargetElement.bookmarkName = tgt.BookmarkTarget.BookmarkName != null ? tgt.BookmarkTarget.BookmarkName.Value : "";
+                TargetElement.bookmarkTargetShapeId = tgt.BookmarkTarget.ShapeId != null ? tgt.BookmarkTarget.ShapeId.Value : 0;
             }
             if (tgt.ShapeTarget != null)
             {
-                TargetElement.ShapeTarget = new HTEXLib.Models.ShapeTarget();
-                TargetElement.ShapeTarget.ShapeId = tgt.ShapeTarget.ShapeId != null ? tgt.ShapeTarget.ShapeId.Value : "";
-                TargetElement.ShapeTarget.SubShapeId = tgt.ShapeTarget.SubShape != null && tgt.ShapeTarget.SubShape.ShapeId != null ? tgt.ShapeTarget.SubShape.ShapeId.Value : "";
-                TargetElement.ShapeTarget.OleChartEl_Level = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Level != null ? tgt.ShapeTarget.OleChartElement.Level.Value : 0;
-                TargetElement.ShapeTarget.OleChartEl_Type = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Type != null ? tgt.ShapeTarget.OleChartElement.Type.Value.ToString() : "";
-                TargetElement.ShapeTarget.TxEl_charRg_Start = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.Start != null ? tgt.ShapeTarget.TextElement.CharRange.Start.Value : 0;
-                TargetElement.ShapeTarget.TxEl_charRg_End = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.End != null ? tgt.ShapeTarget.TextElement.CharRange.End.Value : 0;
-                TargetElement.ShapeTarget.TxEl_pRg_Start = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start.Value : 0;
-                TargetElement.ShapeTarget.TxEl_pRg_End = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.End.Value : 0;
-                TargetElement.ShapeTarget.Bg = tgt.ShapeTarget.BackgroundAnimation != null ? "bg" : "";
-                TargetElement.ShapeTarget.GraphicEl_Diagram_Id = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.Id != null ? tgt.ShapeTarget.GraphicElement.Diagram.Id.Value : "";
-                TargetElement.ShapeTarget.GraphicEl_Diagram_BuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Diagram.BuildStep.Value.ToString() : "";
-                TargetElement.ShapeTarget.GraphicEl_Chart_SeriesIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex.Value : -1;
-                TargetElement.ShapeTarget.GraphicEl_Chart_CategoryIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex.Value : -1;
-                TargetElement.ShapeTarget.GraphicEl_Chart_BuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Chart.BuildStep.Value.ToString() : "";
+                TargetElement.shapeTarget = new HTEXLib.Models.ShapeTarget();
+                TargetElement.shapeTarget.shapeId = tgt.ShapeTarget.ShapeId != null ? tgt.ShapeTarget.ShapeId.Value : "";
+                TargetElement.shapeTarget.subShapeId = tgt.ShapeTarget.SubShape != null && tgt.ShapeTarget.SubShape.ShapeId != null ? tgt.ShapeTarget.SubShape.ShapeId.Value : "";
+                TargetElement.shapeTarget.oleChartElLevel = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Level != null ? tgt.ShapeTarget.OleChartElement.Level.Value : 0;
+                TargetElement.shapeTarget.oleChartElType = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Type != null ? tgt.ShapeTarget.OleChartElement.Type.Value.ToString() : "";
+                TargetElement.shapeTarget.txElCharRgStart = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.Start != null ? tgt.ShapeTarget.TextElement.CharRange.Start.Value : 0;
+                TargetElement.shapeTarget.txElCharRgEnd = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.End != null ? tgt.ShapeTarget.TextElement.CharRange.End.Value : 0;
+                TargetElement.shapeTarget.txElPRgStart = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start.Value : 0;
+                TargetElement.shapeTarget.txElPRgEnd = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.End.Value : 0;
+                TargetElement.shapeTarget.bg = tgt.ShapeTarget.BackgroundAnimation != null ? "bg" : "";
+                TargetElement.shapeTarget.graphicElDiagramId = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.Id != null ? tgt.ShapeTarget.GraphicElement.Diagram.Id.Value : "";
+                TargetElement.shapeTarget.graphicElDiagramBuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Diagram.BuildStep.Value.ToString() : "";
+                TargetElement.shapeTarget.graphicElChartSeriesIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex.Value : -1;
+                TargetElement.shapeTarget.graphicElChartCategoryIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex.Value : -1;
+                TargetElement.shapeTarget.graphicElChartBuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Chart.BuildStep.Value.ToString() : "";
             }
             return TargetElement;
         }
 
         public MediaNode DoMediaNode(CommonMediaNode CommonMediaNode,string partForm) {
             MediaNode MediaNode = new MediaNode();
-            MediaNode.Volume = CommonMediaNode.Volume != null ? CommonMediaNode.Volume.Value : -1;
-            MediaNode.Mute = CommonMediaNode.Mute != null ? CommonMediaNode.Mute.Value : false;
-            MediaNode.SlideCount = CommonMediaNode.SlideCount != null ? CommonMediaNode.SlideCount.Value :0u;
-            MediaNode.ShowWhenStopped = CommonMediaNode.ShowWhenStopped != null ? CommonMediaNode.ShowWhenStopped.Value : false;
+            MediaNode.volume = CommonMediaNode.Volume != null ? CommonMediaNode.Volume.Value : -1;
+            MediaNode.mute = CommonMediaNode.Mute != null ? CommonMediaNode.Mute.Value : false;
+            MediaNode.slideCount = CommonMediaNode.SlideCount != null ? CommonMediaNode.SlideCount.Value :0u;
+            MediaNode.showWhenStopped = CommonMediaNode.ShowWhenStopped != null ? CommonMediaNode.ShowWhenStopped.Value : false;
             if (CommonMediaNode.TargetElement != null) {
                 var tgt = CommonMediaNode.TargetElement;
-                MediaNode.TargetElement = new TargetElement { };
-                MediaNode.TargetElement.SlideTarget = tgt.SlideTarget != null ? "SlideTarget" : null;
+                MediaNode.targetElement = new TargetElement { };
+                MediaNode.targetElement.slideTarget = tgt.SlideTarget != null ? "SlideTarget" : null;
                 if (tgt.SoundTarget != null) {
-                    MediaNode.TargetElement.SoundTarget = new EmbeddedWavAudioFileType();
-                    MediaNode.TargetElement.SoundTarget.Embed = tgt.SoundTarget.Embed != null ? tgt.SoundTarget.Embed.Value : "";
-                    MediaNode.TargetElement.SoundTarget.Name = tgt.SoundTarget.Name != null ? tgt.SoundTarget.Name.Value : "";
-                    MediaNode.TargetElement.SoundTarget.BuiltIn = tgt.SoundTarget.BuiltIn != null ? tgt.SoundTarget.BuiltIn.Value : false;
+                    MediaNode.targetElement.soundTarget = new EmbeddedWavAudioFileType();
+                    MediaNode.targetElement.soundTarget.embed = tgt.SoundTarget.Embed != null ? tgt.SoundTarget.Embed.Value : "";
+                    MediaNode.targetElement.soundTarget.name = tgt.SoundTarget.Name != null ? tgt.SoundTarget.Name.Value : "";
+                    MediaNode.targetElement.soundTarget.builtIn = tgt.SoundTarget.BuiltIn != null ? tgt.SoundTarget.BuiltIn.Value : false;
                     var Embed = tgt.SoundTarget.Embed;
 
                     if (tgt.SoundTarget.Embed!=null )
@@ -561,35 +561,35 @@ namespace HTEXLib.Models
                             //    // htexBlipFill.urlType = "base64";
                             //    //   htexBlipFill.contentType = contentType;
                             //}
-                            MediaNode.TargetElement.SoundTarget.Url = url;
+                            MediaNode.targetElement.soundTarget.url = url;
                         }
                     }
 
                 }
                 if (tgt.InkTarget != null) {
-                    MediaNode.TargetElement.InkTarget_ShapeId = tgt.InkTarget.ShapeId != null ? tgt.InkTarget.ShapeId.Value : "";
+                    MediaNode.targetElement.inkTargetShapeId = tgt.InkTarget.ShapeId != null ? tgt.InkTarget.ShapeId.Value : "";
                 }
 
                 if (tgt.BookmarkTarget!=null) {
-                    MediaNode.TargetElement.BookmarkName = tgt.BookmarkTarget.BookmarkName != null ? tgt.BookmarkTarget.BookmarkName.Value : "";
-                    MediaNode.TargetElement.BookmarkTarget_ShapeId = tgt.BookmarkTarget.ShapeId != null ? tgt.BookmarkTarget.ShapeId.Value : 0;
+                    MediaNode.targetElement.bookmarkName = tgt.BookmarkTarget.BookmarkName != null ? tgt.BookmarkTarget.BookmarkName.Value : "";
+                    MediaNode.targetElement.bookmarkTargetShapeId = tgt.BookmarkTarget.ShapeId != null ? tgt.BookmarkTarget.ShapeId.Value : 0;
                 }
                 if (tgt.ShapeTarget != null) {
-                    MediaNode.TargetElement.ShapeTarget = new ShapeTarget();
-                    MediaNode.TargetElement.ShapeTarget.ShapeId = tgt.ShapeTarget.ShapeId != null ? tgt.ShapeTarget.ShapeId.Value : "";
-                    MediaNode.TargetElement.ShapeTarget.SubShapeId = tgt.ShapeTarget.SubShape != null && tgt.ShapeTarget.SubShape.ShapeId!=null ? tgt.ShapeTarget.SubShape.ShapeId.Value : "";
-                    MediaNode.TargetElement.ShapeTarget.OleChartEl_Level = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Level != null ? tgt.ShapeTarget.OleChartElement.Level.Value : 0;
-                    MediaNode.TargetElement.ShapeTarget.OleChartEl_Type = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Type != null ? tgt.ShapeTarget.OleChartElement.Type.Value.ToString() : "";
-                    MediaNode.TargetElement.ShapeTarget.TxEl_charRg_Start = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.Start != null ? tgt.ShapeTarget.TextElement.CharRange.Start.Value : 0;
-                    MediaNode.TargetElement.ShapeTarget.TxEl_charRg_End = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.End != null ? tgt.ShapeTarget.TextElement.CharRange.End.Value : 0;
-                    MediaNode.TargetElement.ShapeTarget.TxEl_pRg_Start = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start.Value : 0;
-                    MediaNode.TargetElement.ShapeTarget.TxEl_pRg_End = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.End.Value : 0;
-                    MediaNode.TargetElement.ShapeTarget.Bg = tgt.ShapeTarget.BackgroundAnimation != null ? "bg" : "";
-                    MediaNode.TargetElement.ShapeTarget.GraphicEl_Diagram_Id = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.Id != null ? tgt.ShapeTarget.GraphicElement.Diagram.Id.Value : "";
-                    MediaNode.TargetElement.ShapeTarget.GraphicEl_Diagram_BuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Diagram.BuildStep.Value.ToString() : "";
-                    MediaNode.TargetElement.ShapeTarget.GraphicEl_Chart_SeriesIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex.Value: -1;
-                    MediaNode.TargetElement.ShapeTarget.GraphicEl_Chart_CategoryIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex.Value : -1;
-                    MediaNode.TargetElement.ShapeTarget.GraphicEl_Chart_BuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Chart.BuildStep.Value.ToString() : "";
+                    MediaNode.targetElement.shapeTarget = new ShapeTarget();
+                    MediaNode.targetElement.shapeTarget.shapeId = tgt.ShapeTarget.ShapeId != null ? tgt.ShapeTarget.ShapeId.Value : "";
+                    MediaNode.targetElement.shapeTarget.subShapeId = tgt.ShapeTarget.SubShape != null && tgt.ShapeTarget.SubShape.ShapeId!=null ? tgt.ShapeTarget.SubShape.ShapeId.Value : "";
+                    MediaNode.targetElement.shapeTarget.oleChartElLevel = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Level != null ? tgt.ShapeTarget.OleChartElement.Level.Value : 0;
+                    MediaNode.targetElement.shapeTarget.oleChartElType = tgt.ShapeTarget.OleChartElement != null && tgt.ShapeTarget.OleChartElement.Type != null ? tgt.ShapeTarget.OleChartElement.Type.Value.ToString() : "";
+                    MediaNode.targetElement.shapeTarget.txElCharRgStart = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.Start != null ? tgt.ShapeTarget.TextElement.CharRange.Start.Value : 0;
+                    MediaNode.targetElement.shapeTarget.txElCharRgEnd = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.CharRange != null && tgt.ShapeTarget.TextElement.CharRange.End != null ? tgt.ShapeTarget.TextElement.CharRange.End.Value : 0;
+                    MediaNode.targetElement.shapeTarget.txElPRgStart = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start.Value : 0;
+                    MediaNode.targetElement.shapeTarget.txElPRgEnd = tgt.ShapeTarget.TextElement != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange != null && tgt.ShapeTarget.TextElement.ParagraphIndexRange.Start != null ? tgt.ShapeTarget.TextElement.ParagraphIndexRange.End.Value : 0;
+                    MediaNode.targetElement.shapeTarget.bg = tgt.ShapeTarget.BackgroundAnimation != null ? "bg" : "";
+                    MediaNode.targetElement.shapeTarget.graphicElDiagramId = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.Id != null ? tgt.ShapeTarget.GraphicElement.Diagram.Id.Value : "";
+                    MediaNode.targetElement.shapeTarget.graphicElDiagramBuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Diagram != null && tgt.ShapeTarget.GraphicElement.Diagram.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Diagram.BuildStep.Value.ToString() : "";
+                    MediaNode.targetElement.shapeTarget.graphicElChartSeriesIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.SeriesIndex.Value: -1;
+                    MediaNode.targetElement.shapeTarget.graphicElChartCategoryIndex = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex != null ? tgt.ShapeTarget.GraphicElement.Chart.CategoryIndex.Value : -1;
+                    MediaNode.targetElement.shapeTarget.graphicElChartBuildStep = tgt.ShapeTarget.GraphicElement != null && tgt.ShapeTarget.GraphicElement.Chart != null && tgt.ShapeTarget.GraphicElement.Chart.BuildStep != null ? tgt.ShapeTarget.GraphicElement.Chart.BuildStep.Value.ToString() : "";
                 }
             }
             return MediaNode;

+ 8 - 8
HTEXLib/Models/Table.cs

@@ -48,14 +48,14 @@ namespace HTEXLib
 
     public class TbStyle {
         public Position position { get; set; }
-        public Boolean RightToLeft { get; set; }
-        public Boolean FirstRow { get; set; }
-        public Boolean FirstColumn { get; set; }
-        public Boolean LastRow { get; set; }
-        public Boolean LastColumn { get; set; }
-        public Boolean BandRow { get; set; }
-        public Boolean BandColumn { get; set; }
-        public List<double> ColumnWidth { get; set; }
+        public Boolean rightToLeft { get; set; }
+        public Boolean firstRow { get; set; }
+        public Boolean firstColumn { get; set; }
+        public Boolean lastRow { get; set; }
+        public Boolean lastColumn { get; set; }
+        public Boolean bandRow { get; set; }
+        public Boolean bandColumn { get; set; }
+        public List<double> columnWidth { get; set; }
         public List<CellStyle> cellStyles { get; set; }
         public Fill fill { get; set; }
     }

+ 54 - 54
HTEXLib/Models/TimeNode.cs

@@ -24,16 +24,16 @@ namespace HTEXLib.Models
         /// <summary>
         /// 默认禁用 同时进行
         /// </summary>
-        public bool Concurrent { get; set; } = false;
+        public bool concurrent { get; set; } = false;
 
         /// <summary>
         /// None 0 none  , SkipTimed 1 skipTimed
         /// </summary>
-        public string PreviousAction { get; set; }
+        public string previousAction { get; set; }
         /// <summary>
         /// None  0 none , Seek 1 seek  按顺序进行
         /// </summary>
-        public string NextAction { get; set; }
+        public string nextAction { get; set; }
     }
 
     /// <summary>
@@ -46,9 +46,9 @@ namespace HTEXLib.Models
     /// TODO TimeAnimateValueList CommonBehavior  p:cBhvr ///更多信息
     /// </summary>
     public class Anim : TimeNode {
-        public string By { get; set; }
-        public string From { get; set; }
-        public string To { get; set; }
+        public string by { get; set; }
+        public string from { get; set; }
+        public string to { get; set; }
         /// <summary>
         /// CalculationMode
         /// Discrete 0 discrete,Linear 1 lin,  Formula 2 fmla
@@ -68,7 +68,7 @@ namespace HTEXLib.Models
 
     }
     public class TimeAnimate {
-        public string Time { get; set; }
+        public string time { get; set; }
         /// <summary>
         /// 19.5.79
         /// JavaScript Expression Evaluator zip 下载
@@ -77,8 +77,8 @@ namespace HTEXLib.Models
         /// https://github.com/mparlak/Flee
         /// 
         /// </summary>
-        public string Fomula { get; set; }
-        public Val VariantValue { get; set; }
+        public string fomula { get; set; }
+        public Val variantValue { get; set; }
     }
     public class Val {
         public bool boolVal { get; set; }
@@ -91,14 +91,14 @@ namespace HTEXLib.Models
         public string clrVal { get; set; }
     }
     public class Behavior {
-        public string Additive { get; set; }
-        public string TransformType { get; set; }
-        public string Accumulate { get; set; }
-        public string From { get; set; }
-        public string To { get; set; }
-        public string By { get; set; }
-        public string RuntimeContext { get; set; }
-        public string Override { get; set; }
+        public string additive { get; set; }
+        public string transformType { get; set; }
+        public string accumulate { get; set; }
+        public string from { get; set; }
+        public string to { get; set; }
+        public string by { get; set; }
+        public string runtimeContext { get; set; }
+        public string @override { get; set; }
         /// <summary>
         ///style.opacity, style.rotation, style.visibility, style.color, style.fontSize, style.fontWeight, 
         ///style.fontStyle, style.fontFamily, style.textEffectEmboss, style.textShadow, style.textTransform, 
@@ -122,9 +122,9 @@ namespace HTEXLib.Models
         ///extrusion.lockrotationcenter, extrusion.autorotationcenter, extrusion.rotationcenter.x, 
         ///extrusion.rotationcenter.y, extrusion.rotationcenter.z, and extrusion.colormode.
         /// </summary>
-        public List<string> AttrNames { get; set; }
-        public TargetElement TargetElement { get; set; }
-        public Ctn Ctn { get; set; }
+        public List<string> attrNames { get; set; }
+        public TargetElement targetElement { get; set; }
+        public Ctn ctn { get; set; }
     }
     public class Ctn { 
         public long  id { get; set; }
@@ -147,15 +147,15 @@ namespace HTEXLib.Models
         /// <summary>
         /// AnimateColorSpaceValues Rgb 0 rgb, Hsl 1 hsl
         /// </summary>
-        public string ColorSpace { get; set; }
+        public string colorSpace { get; set; }
         /// <summary>
         /// AnimateColorDirectionValues    Clockwise cw 0 , CounterClockwise  ccw 1 
         /// </summary>
-        public string Direction { get; set; }
+        public string direction { get; set; }
         /// <summary>
         /// RgbColor == HslColor===>>  #FF00FF
         /// </summary>
-        public string ByColor { get; set; }
+        public string byColor { get; set; }
 
         /// <summary>
         /// Color3Type  ===>>  #FF00FF
@@ -166,7 +166,7 @@ namespace HTEXLib.Models
         ///     SchemeColor
         ///     PresetColor
         /// </summary>
-        public string FromColor { get; set; }
+        public string fromColor { get; set; }
         /// <summary>
         /// Color3Type  ===>>  #FF00FF
         ///     RgbColorModelPercentage
@@ -176,7 +176,7 @@ namespace HTEXLib.Models
         ///     SchemeColor
         ///     PresetColor
         /// </summary>
-        public string ToColor { get; set; }
+        public string toColor { get; set; }
 
         public Behavior behavior { get; set; }
     }
@@ -193,61 +193,61 @@ namespace HTEXLib.Models
     /// 
     /// </summary>
     public class AnimMotion : TimeNode {
-        public string Origin { get; set; }
-        public string Path { get; set; }
-        public string PathEditMode { get; set; }
-        public int RelativeAngle { get; set; }
-        public string PointTypes { get; set; }
-        public int BounceEnd { get; set; }
-        public PathPoint ByPosition{ get; set; }
-        public PathPoint FromPosition { get; set; }
-        public PathPoint ToPosition { get; set; }
-        public PathPoint RotationCenter { get; set; }
+        public string origin { get; set; }
+        public string path { get; set; }
+        public string pathEditMode { get; set; }
+        public int relativeAngle { get; set; }
+        public string pointTypes { get; set; }
+        public int bounceEnd { get; set; }
+        public PathPoint byPosition{ get; set; }
+        public PathPoint fromPosition { get; set; }
+        public PathPoint toPosition { get; set; }
+        public PathPoint rotationCenter { get; set; }
         public Behavior behavior { get; set; }
     }
     /// <summary>
     /// §20.1.10.3
     /// </summary>
     public class AnimRot :TimeNode{
-        public int By { get; set; }
-        public int From { get; set; }
-        public int To { get; set; }
+        public int by { get; set; }
+        public int from { get; set; }
+        public int to { get; set; }
         /// <summary>
         /// 弹跳
         /// </summary>
-        public int BounceEnd { get; set; }
+        public int bounceEnd { get; set; }
         public Behavior behavior { get; set; }
     }
     public class AnimScale : TimeNode {
         /// <summary>
         /// 弹跳
         /// </summary>
-        public int BounceEnd { get; set; }
-        public PathPoint ByPosition { get; set; }
-        public PathPoint FromPosition { get; set; }
-        public PathPoint ToPosition { get; set; }
+        public int bounceEnd { get; set; }
+        public PathPoint byPosition { get; set; }
+        public PathPoint fromPosition { get; set; }
+        public PathPoint toPosition { get; set; }
         public Behavior behavior { get; set; }
-        public bool ZoomContents { get; set; }
+        public bool zoomContents { get; set; }
     }
     public class Set : TimeNode {
         public Behavior behavior { get; set; }
-        public Val ToVariantValue { get; set; }
+        public Val toVariantValue { get; set; }
     }
     public class Audio : TimeNode
     {
-        public bool IsNarration { get; set; }
-        public MediaNode CommonMediaNode { get; set; }
+        public bool isNarration { get; set; }
+        public MediaNode commonMediaNode { get; set; }
     }
     public class Video : TimeNode
     {
-        public bool FullScreen { get; set; }
-        public MediaNode CommonMediaNode { get; set; }
+        public bool fullScreen { get; set; }
+        public MediaNode commonMediaNode { get; set; }
     }
     public class MediaNode { 
-        public int Volume { get; set; }
-        public bool Mute { get; set; }
-        public UInt32 SlideCount { get; set; }
-        public bool ShowWhenStopped { get; set; }
-        public TargetElement TargetElement { get; set; }
+        public int volume { get; set; }
+        public bool mute { get; set; }
+        public UInt32 slideCount { get; set; }
+        public bool showWhenStopped { get; set; }
+        public TargetElement targetElement { get; set; }
     }
 }