Litle progress

Author: FremyCompany_cp

FC.MathEditor/WpfMathEditor/Classes/ChildrenHelper.vb

@@ -18,7 +18,7 @@
     ''' </summary>
     ''' <param name="Element">The element to search for</param>
     Public Function Contains(ByVal Element As MathElement) As Boolean
-        Return (Element.Parent Is Me) AndAlso Contains_Internal(Element)
+        Return (Element.ParentElement Is Me) AndAlso Contains_Internal(Element)
     End Function
 
     ''' <summary>
@@ -62,7 +62,7 @@
     ''' <param name="OldChild">The old child.</param>
     Public Sub Remove(ByVal OldChild As MathElement)
 
-        If OldChild.Parent IsNot This Then _
+        If OldChild.ParentElement IsNot This Then _
             Throw New ArgumentException("OldChild was not a child of this element.")
 
         Try
@@ -275,7 +275,7 @@
     ''' </summary>
     ''' <param name="Element">The element to be added to the children list</param>
     Public Function CanContains(ByVal Element As MathElement) As Boolean
-        Return (Element IsNot Nothing) AndAlso (Element.Parent Is Nothing) AndAlso CanContains_Internal(Element)
+        Return (Element IsNot Nothing) AndAlso (Element.ParentElement Is Nothing) AndAlso CanContains_Internal(Element)
     End Function
 
     ''' <summary>
@@ -329,9 +329,9 @@
 
             ' Perform checks
             If OldChild Is NewChild Then Throw New ArgumentException("An element can be replaced by itself.")
-            If OldChild.Parent IsNot Me Then Throw New ArgumentException("The element to replace is not attached to this element.")
+            If OldChild.ParentElement IsNot Me Then Throw New ArgumentException("The element to replace is not attached to this element.")
 
-            If NewChild.Parent Is Me Then Remove(NewChild)
+            If NewChild.ParentElement Is Me Then Remove(NewChild)
 
             ' Launch user-defined code
             This.Attach(NewChild)
@@ -487,70 +487,4 @@
         Return GetEnumerator()
     End Function
 
-End Class
-
-Public Class SiblingEnumeratorGenerator : Implements IEnumerable(Of MathElement)
-
-    Private FirstEl, LastEl As MathElement
-    Public Sub New(ByVal FirstEl As MathElement)
-        Me.New(FirstEl, Nothing)
-    End Sub
-
-    Public Sub New(ByVal FirstEl As MathElement, ByVal LastEl As MathElement)
-        Me.FirstEl = FirstEl : Me.LastEl = LastEl
-    End Sub
-
-    Public Function GetEnumerator() As System.Collections.Generic.IEnumerator(Of MathElement) Implements System.Collections.Generic.IEnumerable(Of MathElement).GetEnumerator
-        Return New SiblingEnumerator(FirstEl, LastEl)
-    End Function
-
-    Public Function GetGenericEnumerator() As System.Collections.IEnumerator Implements System.Collections.IEnumerable.GetEnumerator
-        Return GetEnumerator()
-    End Function
-
-End Class
-
-Public Class SiblingEnumerator : Implements IEnumerator(Of MathElement)
-
-    Private FirstEl As MathElement, NextEl As MathElement, CurrentEl As MathElement
-    Public Sub New(ByVal FirstEl As MathElement)
-        Me.FirstEl = FirstEl : Me.NextEl = FirstEl
-    End Sub
-
-    Private LastEl As MathElement
-    Public Sub New(ByVal FirstEl As MathElement, ByVal LastEl As MathElement)
-        Me.FirstEl = FirstEl : Me.NextEl = FirstEl : Me.LastEl = LastEl
-    End Sub
-
-    Public ReadOnly Property Current As MathElement Implements System.Collections.Generic.IEnumerator(Of MathElement).Current
-        Get
-            Return CurrentEl
-        End Get
-    End Property
-
-    Public ReadOnly Property CurrentUnTyped As Object Implements System.Collections.IEnumerator.Current
-        Get
-            Return CurrentEl
-        End Get
-    End Property
-
-    Public Function MoveNext() As Boolean Implements System.Collections.IEnumerator.MoveNext
-        If (NextEl Is Nothing) OrElse (LastEl IsNot Nothing AndAlso Current Is LastEl) Then
-            CurrentEl = Nothing
-            Return False
-        Else
-            CurrentEl = NextEl
-            NextEl = CurrentEl.NextSibling
-            Return True
-        End If
-    End Function
-
-    Public Sub Reset() Implements System.Collections.IEnumerator.Reset
-        NextEl = FirstEl : CurrentEl = Nothing
-    End Sub
-
-    Public Sub Dispose() Implements IDisposable.Dispose
-        FirstEl = Nothing : NextEl = Nothing : CurrentEl = Nothing
-    End Sub
-
-End Class
+End Class

FC.MathEditor/WpfMathEditor/Classes/ExportHelper.vb

@@ -185,10 +185,10 @@
     Private _LocationInParent As Rect
     Public ReadOnly Property LocationInParent As Rect
         Get
-            If This.Parent Is Nothing Then
+            If This.ParentElement Is Nothing Then
                 Return SizeRect
             Else
-                This.Parent.Export.PerformLayout()
+                This.ParentElement.Export.PerformLayout()
                 Return _LocationInParent
             End If
         End Get
@@ -200,11 +200,11 @@
 
     Public ReadOnly Property LocationInRoot As Rect
         Get
-            If This.Parent Is Nothing Then Return LocationInParent
+            If This.ParentElement Is Nothing Then Return LocationInParent
 
             This.Root.Export.PerformLayout()
             Dim L = LocationInParent
-            Return FitRect(LocationInParent, This.Parent.Export.SizeRect, This.Parent.Export.LocationInRoot)
+            Return FitRect(LocationInParent, This.ParentElement.Export.SizeRect, This.ParentElement.Export.LocationInRoot)
 
         End Get
     End Property

FC.MathEditor/WpfMathEditor/Classes/InputHelper.vb

@@ -207,8 +207,8 @@
         End If
 
         ' The parent may want to pre-process, too
-        If This.Parent IsNot Nothing Then
-            This.Parent.Input.PreProcessChar(InputChar)
+        If This.ParentElement IsNot Nothing Then
+            This.ParentElement.Input.PreProcessChar(InputChar)
         End If
 
         ' No pre-process
@@ -218,7 +218,7 @@
 
     Public Overridable Function ProcessWaitChar(ByVal InputChar As Integer) As Boolean
         ' Default wait char processing : eat, and walk to next child
-        WaitChar = Nothing : This.Selection.SetSelection(This.Parent, This, This.NextSibling)
+        WaitChar = Nothing : This.Selection.SetSelection(This.ParentElement, This, This.NextSibling)
         Return True
     End Function
 
@@ -328,10 +328,10 @@
     Public Property WritingMode As InputWritingMode
         Get
             If WM = 0 Then
-                If This.Parent Is Nothing Then
+                If This.ParentElement Is Nothing Then
                     Return InputWritingMode.Linear
                 Else
-                    Return This.Parent.Input.WritingMode
+                    Return This.ParentElement.Input.WritingMode
                 End If
             Else
                 Return WM

FC.MathEditor/WpfMathEditor/Classes/MathElement.Input.vb

@@ -38,27 +38,35 @@
     End Property
 
     Public Overridable Function GetNextInputElement(ByVal CurrentElement As MathElement) As MathElement
-        If CurrentElement Is Nothing Then Return Children.First
-        Return Children.After(CurrentElement)
+        If Me.Children.IsFormatter Then
+            If CurrentElement Is Nothing Then Return Children.First
+            Return Children.After(CurrentElement)
+        Else
+            Return Nothing
+        End If
     End Function
 
     Public Overridable Function GetPreviousInputElement(ByVal CurrentElement As MathElement) As MathElement
-        If CurrentElement Is Nothing Then Return Children.Last
-        Return Children.Before(CurrentElement)
+        If Me.Children.IsFormatter Then
+            If CurrentElement Is Nothing Then Return Children.Last
+            Return Children.Before(CurrentElement)
+        Else
+            Return Nothing
+        End If
     End Function
 
     Public ReadOnly Property ParentLayoutEngine As MathElement
         Get
-            Dim P As MathElement = Parent
-            If Parent Is Nothing Then
+            Dim P As MathElement = ParentElement
+            If ParentElement Is Nothing Then
                 Throw New InvalidOperationException("Unable to retreive a ParentLayoutEngine from an unparented element.")
             End If
 
             While P IsNot Nothing
                 If P.Children.IsLayoutEngine Then
                     Return P
                 Else
-                    P = P.Parent
+                    P = P.ParentElement
                 End If
             End While
 
@@ -69,15 +77,15 @@
     Public ReadOnly Property ParentLayoutEngineChild As MathElement
         Get
             Dim P As MathElement = Me
-            If Parent Is Nothing Then
+            If ParentElement Is Nothing Then
                 Throw New InvalidOperationException("Unable to retreive a ParentLayoutEngine from an unparented element.")
             End If
 
             While P IsNot Nothing
-                If P.Parent.Children.IsLayoutEngine Then
+                If P.ParentElement.Children.IsLayoutEngine Then
                     Return P
                 Else
-                    P = P.Parent
+                    P = P.ParentElement
                 End If
             End While
 

FC.MathEditor/WpfMathEditor/Classes/MathElement.Layout.vb

@@ -52,10 +52,10 @@
     Public Property FontFamily As FontFamily
         Get
             If _FontFamily Is Nothing Then
-                If Parent Is Nothing Then
+                If ParentElement Is Nothing Then
                     Return DefaultFontFamily
                 Else
-                    _FontFamily = Parent.FontFamily
+                    _FontFamily = ParentElement.FontFamily
                     Return _FontFamily
                 End If
             Else
@@ -82,10 +82,10 @@
     Public Property FontStretch As FontStretch?
         Get
             If _FontStretch Is Nothing Then
-                If Parent Is Nothing Then
+                If ParentElement Is Nothing Then
                     Return DefaultFontStretch
                 Else
-                    _FontStretch = Parent.FontStretch
+                    _FontStretch = ParentElement.FontStretch
                     Return _FontStretch
                 End If
             Else
@@ -112,10 +112,10 @@
     Public Property FontStyle As FontStyle?
         Get
             If _FontStyle Is Nothing Then
-                If Parent Is Nothing Then
+                If ParentElement Is Nothing Then
                     Return DefaultFontStyle
                 Else
-                    _FontStyle = Parent.FontStyle
+                    _FontStyle = ParentElement.FontStyle
                     Return _FontStyle
                 End If
             Else
@@ -142,10 +142,10 @@
     Public Property FontWeight As FontWeight?
         Get
             If _FontWeight Is Nothing Then
-                If Parent Is Nothing Then
+                If ParentElement Is Nothing Then
                     Return DefaultFontWeight
                 Else
-                    _FontWeight = Parent.FontWeight
+                    _FontWeight = ParentElement.FontWeight
                     Return _FontWeight
                 End If
             Else
@@ -173,10 +173,10 @@
     Public Property Foreground As Color?
         Get
             If _Foreground Is Nothing Then
-                If Parent Is Nothing Then
+                If ParentElement Is Nothing Then
                     Return SystemColors.WindowTextColor
                 Else
-                    _Foreground = Parent.Foreground
+                    _Foreground = ParentElement.Foreground
                     Return _Foreground
                 End If
             Else
@@ -203,10 +203,10 @@
     Public Property FontSize As Double?
         Get
             If _FontSize Is Nothing Then
-                If Parent Is Nothing Then
+                If ParentElement Is Nothing Then
                     Return 20
                 Else
-                    _FontSize = Parent.FontSize
+                    _FontSize = ParentElement.FontSize
                     Return _FontSize
                 End If
             Else
@@ -233,10 +233,10 @@
     Public Property Background As Color?
         Get
             If _Background Is Nothing Then
-                If Parent Is Nothing Then
+                If ParentElement Is Nothing Then
                     Return Colors.Transparent
                 Else
-                    _Background = Parent.Background
+                    _Background = ParentElement.Background
                     Return _Background
                 End If
             Else