[*-Source] Move document setup/partitioning into separate packages
Change-Id: Ie45ad89b53ee43173f9d47a788d1958a5f76515c
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/META-INF/MANIFEST.MF b/docmlet/org.eclipse.statet.docmlet.tex.core/META-INF/MANIFEST.MF
index 02de1a3..4932275 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/META-INF/MANIFEST.MF
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/META-INF/MANIFEST.MF
@@ -34,4 +34,5 @@
org.eclipse.statet.docmlet.tex.core.project,
org.eclipse.statet.docmlet.tex.core.refactoring,
org.eclipse.statet.docmlet.tex.core.source,
+ org.eclipse.statet.docmlet.tex.core.source.doc,
org.eclipse.statet.docmlet.tex.core.util
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/plugin.xml b/docmlet/org.eclipse.statet.docmlet.tex.core/plugin.xml
index 0a6b054..00c1fb6 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/plugin.xml
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/plugin.xml
@@ -40,7 +40,7 @@
point="org.eclipse.core.filebuffers.documentSetup">
<participant
contentTypeId="org.eclipse.statet.docmlet.contentTypes.Ltx"
- class="org.eclipse.statet.docmlet.tex.core.source.LtxDocumentSetupParticipant">
+ class="org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentSetupParticipant">
</participant>
</extension>
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/model/LtxSourceResourceSourceUnit.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/model/LtxSourceResourceSourceUnit.java
index 9aa6c2c..35f4b00 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/model/LtxSourceResourceSourceUnit.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/model/LtxSourceResourceSourceUnit.java
@@ -24,7 +24,7 @@
import org.eclipse.statet.docmlet.tex.core.TexCoreAccess;
import org.eclipse.statet.docmlet.tex.core.model.build.LtxSourceUnitModelContainer;
-import org.eclipse.statet.docmlet.tex.core.source.LtxDocumentContentInfo;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentContentInfo;
import org.eclipse.statet.internal.docmlet.tex.core.WorkspaceAdapterFactory;
import org.eclipse.statet.ltk.model.core.impl.GenericResourceSourceUnit2;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/refactoring/LtxRefactoringAdapter.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/refactoring/LtxRefactoringAdapter.java
index 926512b..a8b7db9 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/refactoring/LtxRefactoringAdapter.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/refactoring/LtxRefactoringAdapter.java
@@ -29,7 +29,7 @@
import org.eclipse.statet.docmlet.tex.core.model.TexModel;
import org.eclipse.statet.docmlet.tex.core.model.TexSourceElement;
import org.eclipse.statet.docmlet.tex.core.source.LtxHeuristicTokenScanner;
-import org.eclipse.statet.docmlet.tex.core.source.TexDocumentConstants;
+import org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants;
import org.eclipse.statet.ltk.model.core.ElementSet;
import org.eclipse.statet.ltk.model.core.element.LtkModelElement;
import org.eclipse.statet.ltk.model.core.element.SourceElement;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxBracketPairMatcher.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxBracketPairMatcher.java
index 9f2765e..aebef85 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxBracketPairMatcher.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxBracketPairMatcher.java
@@ -17,6 +17,8 @@
import org.eclipse.statet.ecommons.text.ITokenScanner;
import org.eclipse.statet.ecommons.text.PairMatcher;
+import org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants;
+
/**
* A pair finder class for implementing the pair matching.
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxChunkHeuristicTokenScanner.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxChunkHeuristicTokenScanner.java
index d0d21bf..6274193 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxChunkHeuristicTokenScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxChunkHeuristicTokenScanner.java
@@ -24,6 +24,8 @@
import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartitionUtils;
+import org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants;
+
public class LtxChunkHeuristicTokenScanner extends LtxHeuristicTokenScanner {
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxHeuristicTokenScanner.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxHeuristicTokenScanner.java
index 6e2c176..77b4f77 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxHeuristicTokenScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxHeuristicTokenScanner.java
@@ -24,6 +24,8 @@
import org.eclipse.statet.ecommons.text.core.PartitionConstraint;
import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
+import org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants;
+
public class LtxHeuristicTokenScanner extends BasicHeuristicTokenScanner {
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxDocumentContentInfo.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxDocumentContentInfo.java
similarity index 95%
rename from docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxDocumentContentInfo.java
rename to docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxDocumentContentInfo.java
index 10e9a4f..dd63a38 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxDocumentContentInfo.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxDocumentContentInfo.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.tex.core.source;
+package org.eclipse.statet.docmlet.tex.core.source.doc;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxDocumentSetupParticipant.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxDocumentSetupParticipant.java
similarity index 96%
rename from docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxDocumentSetupParticipant.java
rename to docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxDocumentSetupParticipant.java
index 2a763c7..97474e0 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxDocumentSetupParticipant.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxDocumentSetupParticipant.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.tex.core.source;
+package org.eclipse.statet.docmlet.tex.core.source.doc;
import org.eclipse.jface.text.IDocumentPartitioner;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxPartitionNodeScanner.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxPartitionNodeScanner.java
similarity index 99%
rename from docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxPartitionNodeScanner.java
rename to docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxPartitionNodeScanner.java
index e110727..4bc4177 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxPartitionNodeScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxPartitionNodeScanner.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.tex.core.source;
+package org.eclipse.statet.docmlet.tex.core.source.doc;
import static org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartitionNode.END_UNCLOSED;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxPartitionNodeType.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxPartitionNodeType.java
similarity index 99%
rename from docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxPartitionNodeType.java
rename to docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxPartitionNodeType.java
index a4a740c..71e9f6d 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/LtxPartitionNodeType.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/LtxPartitionNodeType.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.tex.core.source;
+package org.eclipse.statet.docmlet.tex.core.source.doc;
import org.eclipse.jface.text.IDocument;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/TexDocumentConstants.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/TexDocumentConstants.java
similarity index 97%
rename from docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/TexDocumentConstants.java
rename to docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/TexDocumentConstants.java
index bb269f0..5aa7593 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/TexDocumentConstants.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/docmlet/tex/core/source/doc/TexDocumentConstants.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.tex.core.source;
+package org.eclipse.statet.docmlet.tex.core.source.doc;
import org.eclipse.statet.jcommons.collections.ImCollections;
import org.eclipse.statet.jcommons.collections.ImList;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfiguration.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfiguration.java
index 47b8c48..15b8e01 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfiguration.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfiguration.java
@@ -38,9 +38,9 @@
import org.eclipse.statet.docmlet.tex.core.TexCore;
import org.eclipse.statet.docmlet.tex.core.TexCoreAccess;
import org.eclipse.statet.docmlet.tex.core.source.LtxBracketPairMatcher;
-import org.eclipse.statet.docmlet.tex.core.source.LtxDocumentContentInfo;
import org.eclipse.statet.docmlet.tex.core.source.LtxHeuristicTokenScanner;
-import org.eclipse.statet.docmlet.tex.core.source.TexDocumentConstants;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentContentInfo;
+import org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants;
import org.eclipse.statet.docmlet.tex.ui.text.LtxDefaultTextStyleScanner;
import org.eclipse.statet.docmlet.tex.ui.text.LtxDoubleClickStrategy;
import org.eclipse.statet.docmlet.tex.ui.text.LtxMathTextStyleScanner;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfigurator.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfigurator.java
index a466a20..2a652a2 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfigurator.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfigurator.java
@@ -32,7 +32,7 @@
import org.eclipse.statet.docmlet.tex.core.TexCore;
import org.eclipse.statet.docmlet.tex.core.TexCoreAccess;
import org.eclipse.statet.docmlet.tex.core.commands.TexCommandSet;
-import org.eclipse.statet.docmlet.tex.core.source.LtxDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentSetupParticipant;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfigurator;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxTemplateSourceViewerConfigurator.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxTemplateSourceViewerConfigurator.java
index 5e83f5e..42a8d87 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxTemplateSourceViewerConfigurator.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxTemplateSourceViewerConfigurator.java
@@ -19,7 +19,7 @@
import org.eclipse.statet.ecommons.templates.TemplateVariableProcessor;
import org.eclipse.statet.docmlet.tex.core.TexCoreAccess;
-import org.eclipse.statet.docmlet.tex.core.source.LtxDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentSetupParticipant;
public class LtxTemplateSourceViewerConfigurator extends LtxSourceViewerConfigurator {
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxDoubleClickStrategy.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxDoubleClickStrategy.java
index 3f91312..8c55c25 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxDoubleClickStrategy.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxDoubleClickStrategy.java
@@ -27,7 +27,7 @@
import org.eclipse.statet.docmlet.tex.core.source.LtxBracketPairMatcher;
import org.eclipse.statet.docmlet.tex.core.source.LtxHeuristicTokenScanner;
-import org.eclipse.statet.docmlet.tex.core.source.TexDocumentConstants;
+import org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants;
/**
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/LtxEditorUriSourceUnit.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/LtxEditorUriSourceUnit.java
index b68454b..f9d2fd6 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/LtxEditorUriSourceUnit.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/LtxEditorUriSourceUnit.java
@@ -28,7 +28,7 @@
import org.eclipse.statet.docmlet.tex.core.TexCoreAccess;
import org.eclipse.statet.docmlet.tex.core.model.TexModel;
import org.eclipse.statet.docmlet.tex.core.model.TexSourceUnit;
-import org.eclipse.statet.docmlet.tex.core.source.LtxDocumentContentInfo;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentContentInfo;
import org.eclipse.statet.ltk.core.Ltk;
import org.eclipse.statet.ltk.core.WorkingContext;
import org.eclipse.statet.ltk.model.core.element.SourceDocumentRunnable;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxEditorTemplatesPreferencePage.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxEditorTemplatesPreferencePage.java
index 835836b..9ac8ae4 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxEditorTemplatesPreferencePage.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxEditorTemplatesPreferencePage.java
@@ -20,7 +20,7 @@
import org.eclipse.statet.ecommons.templates.TemplateVariableProcessor;
import org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartitioner;
-import org.eclipse.statet.docmlet.tex.core.source.LtxPartitionNodeType;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxPartitionNodeType;
import org.eclipse.statet.docmlet.tex.ui.sourceediting.LtxTemplateSourceViewerConfigurator;
import org.eclipse.statet.internal.docmlet.tex.ui.TexUIPlugin;
import org.eclipse.statet.internal.docmlet.tex.ui.editors.LtxEditorContextType;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxTextStylesPreferencePage.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxTextStylesPreferencePage.java
index 3656e43..1227299 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxTextStylesPreferencePage.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxTextStylesPreferencePage.java
@@ -29,8 +29,8 @@
import org.eclipse.statet.ecommons.text.ui.settings.PreferenceStoreTextStyleManager;
import org.eclipse.statet.docmlet.tex.core.TexCore;
-import org.eclipse.statet.docmlet.tex.core.source.LtxDocumentContentInfo;
-import org.eclipse.statet.docmlet.tex.core.source.LtxDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentContentInfo;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentSetupParticipant;
import org.eclipse.statet.docmlet.tex.ui.sourceediting.LtxSourceViewerConfiguration;
import org.eclipse.statet.docmlet.tex.ui.text.TexTextStyles;
import org.eclipse.statet.internal.docmlet.tex.ui.TexUIPlugin;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxDocEditor.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxDocEditor.java
index 08faee2..08d9005 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxDocEditor.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxDocEditor.java
@@ -35,8 +35,8 @@
import org.eclipse.statet.docmlet.tex.core.TexCore;
import org.eclipse.statet.docmlet.tex.core.model.TexModel;
import org.eclipse.statet.docmlet.tex.core.model.TexSourceUnit;
-import org.eclipse.statet.docmlet.tex.core.source.LtxDocumentContentInfo;
-import org.eclipse.statet.docmlet.tex.core.source.TexDocumentConstants;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentContentInfo;
+import org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants;
import org.eclipse.statet.docmlet.tex.ui.TexUI;
import org.eclipse.statet.docmlet.tex.ui.editors.LtxDefaultFoldingProvider;
import org.eclipse.statet.docmlet.tex.ui.editors.LtxEditor;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxDocumentProvider.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxDocumentProvider.java
index 60fa0a6..59dac1d 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxDocumentProvider.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxDocumentProvider.java
@@ -33,7 +33,7 @@
import org.eclipse.statet.docmlet.tex.core.model.TexModel;
import org.eclipse.statet.docmlet.tex.core.model.TexSourceUnit;
import org.eclipse.statet.docmlet.tex.core.project.TexIssues;
-import org.eclipse.statet.docmlet.tex.core.source.LtxDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentSetupParticipant;
import org.eclipse.statet.docmlet.tex.ui.TexUI;
import org.eclipse.statet.docmlet.tex.ui.editors.TexEditorBuild;
import org.eclipse.statet.ltk.core.Ltk;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxEditorTemplateCompletionComputer.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxEditorTemplateCompletionComputer.java
index 7988ad3..6663357 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxEditorTemplateCompletionComputer.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxEditorTemplateCompletionComputer.java
@@ -25,7 +25,7 @@
import org.eclipse.statet.jcommons.lang.Nullable;
import org.eclipse.statet.jcommons.text.core.TextRegion;
-import org.eclipse.statet.docmlet.tex.core.source.TexDocumentConstants;
+import org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants;
import org.eclipse.statet.internal.docmlet.tex.ui.TexUIPlugin;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor;
import org.eclipse.statet.ltk.ui.sourceediting.assist.AssistInvocationContext;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxMergeViewer.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxMergeViewer.java
index def6a1e..30efd0c 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxMergeViewer.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxMergeViewer.java
@@ -19,7 +19,7 @@
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.statet.docmlet.tex.core.source.LtxDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxDocumentSetupParticipant;
import org.eclipse.statet.docmlet.tex.ui.sourceediting.LtxSourceViewerConfiguration;
import org.eclipse.statet.docmlet.tex.ui.sourceediting.LtxSourceViewerConfigurator;
import org.eclipse.statet.ltk.ui.compare.CompareMergeTextViewer;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/sourceediting/LtxAutoEditStrategy.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/sourceediting/LtxAutoEditStrategy.java
index 9dd7a51..5aca33d 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/sourceediting/LtxAutoEditStrategy.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/sourceediting/LtxAutoEditStrategy.java
@@ -19,9 +19,9 @@
import static org.eclipse.statet.docmlet.tex.core.source.LtxHeuristicTokenScanner.CURLY_BRACKET_TYPE;
import static org.eclipse.statet.docmlet.tex.core.source.LtxHeuristicTokenScanner.PARATHESIS_TYPE;
import static org.eclipse.statet.docmlet.tex.core.source.LtxHeuristicTokenScanner.SQUARE_BRACKET_TYPE;
-import static org.eclipse.statet.docmlet.tex.core.source.TexDocumentConstants.LTX_ANY_CONTENT_CONSTRAINT;
-import static org.eclipse.statet.docmlet.tex.core.source.TexDocumentConstants.LTX_DEFAULT_CONTENT_CONSTRAINT;
-import static org.eclipse.statet.docmlet.tex.core.source.TexDocumentConstants.LTX_DEFAULT_OR_MATH_CONTENT_CONSTRAINT;
+import static org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants.LTX_ANY_CONTENT_CONSTRAINT;
+import static org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants.LTX_DEFAULT_CONTENT_CONSTRAINT;
+import static org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants.LTX_DEFAULT_OR_MATH_CONTENT_CONSTRAINT;
import java.util.Map;
import java.util.Set;
@@ -65,8 +65,8 @@
import org.eclipse.statet.docmlet.tex.core.parser.NowebLtxLexer;
import org.eclipse.statet.docmlet.tex.core.refactoring.LtxSourceIndenter;
import org.eclipse.statet.docmlet.tex.core.source.LtxHeuristicTokenScanner;
-import org.eclipse.statet.docmlet.tex.core.source.LtxPartitionNodeType;
-import org.eclipse.statet.docmlet.tex.core.source.TexDocumentConstants;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxPartitionNodeType;
+import org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants;
import org.eclipse.statet.docmlet.tex.ui.sourceediting.TexEditingSettings;
import org.eclipse.statet.internal.docmlet.tex.ui.editors.HardLineWrap;
import org.eclipse.statet.ltk.ui.sourceediting.AbstractAutoEditStrategy;
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/sourceediting/LtxContextInformationValidator.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/sourceediting/LtxContextInformationValidator.java
index 1c7e4b9..366a248 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/sourceediting/LtxContextInformationValidator.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/sourceediting/LtxContextInformationValidator.java
@@ -44,7 +44,7 @@
import org.eclipse.statet.docmlet.tex.core.model.LtxSourceUnitModelInfo;
import org.eclipse.statet.docmlet.tex.core.model.TexSourceUnit;
import org.eclipse.statet.docmlet.tex.core.parser.NowebLtxLexer;
-import org.eclipse.statet.docmlet.tex.core.source.LtxPartitionNodeScanner;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxPartitionNodeScanner;
import org.eclipse.statet.ltk.core.StatusCodes;
import org.eclipse.statet.ltk.model.core.element.SourceUnit;
import org.eclipse.statet.ltk.model.core.element.SourceUnitModelInfo;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/META-INF/MANIFEST.MF b/docmlet/org.eclipse.statet.docmlet.wikitext.core/META-INF/MANIFEST.MF
index 80997c7..bf4c5d5 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/META-INF/MANIFEST.MF
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/META-INF/MANIFEST.MF
@@ -40,5 +40,6 @@
org.eclipse.statet.docmlet.wikitext.core.project,
org.eclipse.statet.docmlet.wikitext.core.refactoring,
org.eclipse.statet.docmlet.wikitext.core.source,
+ org.eclipse.statet.docmlet.wikitext.core.source.doc,
org.eclipse.statet.docmlet.wikitext.core.source.extdoc,
org.eclipse.statet.docmlet.wikitext.core.util
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/HardLineWrap.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/HardLineWrap.java
index b36895a..49b4035 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/HardLineWrap.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/HardLineWrap.java
@@ -44,6 +44,7 @@
import org.eclipse.statet.docmlet.wikitext.core.ast.Text;
import org.eclipse.statet.docmlet.wikitext.core.ast.WikitextAstVisitor;
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguage;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikidocDocumentSetupParticipant;
import org.eclipse.statet.docmlet.wikitext.core.source.extdoc.ExtdocMarkupLanguage;
import org.eclipse.statet.ltk.ast.core.AstInfo;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupBracketPairMatcher.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupBracketPairMatcher.java
index b86ebe3..539e3a1 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupBracketPairMatcher.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupBracketPairMatcher.java
@@ -17,6 +17,8 @@
import org.eclipse.statet.ecommons.text.ITokenScanner;
import org.eclipse.statet.ecommons.text.PairMatcher;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextDocumentConstants;
+
/**
* A pair finder class for implementing the pair matching.
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextHeuristicTokenScanner.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextHeuristicTokenScanner.java
index 116540c..07fdb94 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextHeuristicTokenScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextHeuristicTokenScanner.java
@@ -20,6 +20,8 @@
import org.eclipse.statet.ecommons.text.BasicHeuristicTokenScanner;
import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextDocumentConstants;
+
public class WikitextHeuristicTokenScanner extends BasicHeuristicTokenScanner {
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguageDocumentSetupParticipant.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguageDocumentSetupParticipant.java
similarity index 97%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguageDocumentSetupParticipant.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguageDocumentSetupParticipant.java
index 836d9df..46a5ee3 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguageDocumentSetupParticipant.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguageDocumentSetupParticipant.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension3;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguageDocumentSetupParticipant1.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguageDocumentSetupParticipant1.java
similarity index 97%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguageDocumentSetupParticipant1.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguageDocumentSetupParticipant1.java
index 0b17daf..ebca1f7 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguageDocumentSetupParticipant1.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguageDocumentSetupParticipant1.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
import org.eclipse.core.filebuffers.IDocumentSetupParticipantExtension;
import org.eclipse.core.filebuffers.LocationKind;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguagePartitionNodeScanner.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguagePartitionNodeScanner.java
similarity index 92%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguagePartitionNodeScanner.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguagePartitionNodeScanner.java
index 71c2cde..b6977c9 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguagePartitionNodeScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguagePartitionNodeScanner.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
public class MarkupLanguagePartitionNodeScanner {
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguagePartitioner.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguagePartitioner.java
similarity index 94%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguagePartitioner.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguagePartitioner.java
index c2c3239..3e63f3a 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/MarkupLanguagePartitioner.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/MarkupLanguagePartitioner.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.IDocumentPartitionerExtension3;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikidocDocumentContentInfo.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikidocDocumentContentInfo.java
similarity index 95%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikidocDocumentContentInfo.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikidocDocumentContentInfo.java
index ec257c0..b3c24fa 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikidocDocumentContentInfo.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikidocDocumentContentInfo.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikidocDocumentSetupParticipant.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikidocDocumentSetupParticipant.java
similarity index 96%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikidocDocumentSetupParticipant.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikidocDocumentSetupParticipant.java
index 9008130..1a18961 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikidocDocumentSetupParticipant.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikidocDocumentSetupParticipant.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguage;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextDocumentConstants.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextDocumentConstants.java
similarity index 91%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextDocumentConstants.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextDocumentConstants.java
index 226826d..168aab4 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextDocumentConstants.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextDocumentConstants.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
import org.eclipse.statet.jcommons.collections.ImCollections;
import org.eclipse.statet.jcommons.collections.ImList;
@@ -20,8 +20,8 @@
import org.eclipse.statet.ecommons.text.core.PartitionConstraint;
-import org.eclipse.statet.docmlet.tex.core.source.TexDocumentConstants;
-import org.eclipse.statet.yaml.core.source.YamlDocumentConstants;
+import org.eclipse.statet.docmlet.tex.core.source.doc.TexDocumentConstants;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentConstants;
@NonNullByDefault
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextPartitionNodeScanner.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextPartitionNodeScanner.java
similarity index 98%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextPartitionNodeScanner.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextPartitionNodeScanner.java
index 1668057..3945093 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextPartitionNodeScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextPartitionNodeScanner.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
import java.util.ArrayList;
import java.util.List;
@@ -32,6 +32,7 @@
import org.eclipse.statet.docmlet.wikitext.core.markup.MarkupParser2;
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextLocator;
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguage;
+import org.eclipse.statet.docmlet.wikitext.core.source.SourceElementDetail;
import org.eclipse.statet.ltk.core.source.SourceContent;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextPartitionNodeType.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextPartitionNodeType.java
similarity index 98%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextPartitionNodeType.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextPartitionNodeType.java
index 78da704..d0aa1fc 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextPartitionNodeType.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextPartitionNodeType.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
import java.util.EnumMap;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextPartitioner.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextPartitioner.java
similarity index 96%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextPartitioner.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextPartitioner.java
index e557a13..b797185 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextPartitioner.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextPartitioner.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
import java.util.List;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextWeavePartitionNodeScanner.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextWeavePartitionNodeScanner.java
similarity index 97%
rename from docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextWeavePartitionNodeScanner.java
rename to docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextWeavePartitionNodeScanner.java
index 509186e..a56290b 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/WikitextWeavePartitionNodeScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/doc/WikitextWeavePartitionNodeScanner.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.docmlet.wikitext.core.source;
+package org.eclipse.statet.docmlet.wikitext.core.source.doc;
import java.util.ArrayList;
import java.util.List;
@@ -30,6 +30,7 @@
import org.eclipse.statet.docmlet.wikitext.core.markup.MarkupParser2;
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguage;
+import org.eclipse.statet.docmlet.wikitext.core.source.EmbeddingAttributes;
public class WikitextWeavePartitionNodeScanner extends WikitextPartitionNodeScanner {
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/extdoc/HtmlPartitionNodeType.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/extdoc/HtmlPartitionNodeType.java
index a2c2502..803993a 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/extdoc/HtmlPartitionNodeType.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/extdoc/HtmlPartitionNodeType.java
@@ -18,7 +18,7 @@
import org.eclipse.statet.ecommons.text.core.treepartitioner.BasicPartitionNodeType;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikitextDocumentConstants;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextDocumentConstants;
@NonNullByDefault
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/extdoc/WikidocPartitionNodeScanner.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/extdoc/WikidocPartitionNodeScanner.java
index dd6169f..542bd25 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/extdoc/WikidocPartitionNodeScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/source/extdoc/WikidocPartitionNodeScanner.java
@@ -21,14 +21,14 @@
import org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartitionNodeScanner;
import org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartitionNodeType;
-import org.eclipse.statet.docmlet.tex.core.source.LtxPartitionNodeScanner;
-import org.eclipse.statet.docmlet.tex.core.source.LtxPartitionNodeType;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxPartitionNodeScanner;
+import org.eclipse.statet.docmlet.tex.core.source.doc.LtxPartitionNodeType;
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguage;
import org.eclipse.statet.docmlet.wikitext.core.source.EmbeddingAttributes;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikitextDocumentConstants;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikitextPartitionNodeType;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikitextWeavePartitionNodeScanner;
-import org.eclipse.statet.yaml.core.source.YamlPartitionNodeScanner;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextDocumentConstants;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextPartitionNodeType;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextWeavePartitionNodeScanner;
+import org.eclipse.statet.yaml.core.source.doc.YamlPartitionNodeScanner;
public class WikidocPartitionNodeScanner extends WikitextWeavePartitionNodeScanner {
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/MarkupConfigTextFileBufferUpdater.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/MarkupConfigTextFileBufferUpdater.java
index 65b3e3d..a421797 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/MarkupConfigTextFileBufferUpdater.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/MarkupConfigTextFileBufferUpdater.java
@@ -43,8 +43,8 @@
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguageManager1;
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguageManager1.MarkupConfigChangedListener;
import org.eclipse.statet.docmlet.wikitext.core.model.WikitextModel;
-import org.eclipse.statet.docmlet.wikitext.core.source.MarkupLanguageDocumentSetupParticipant;
-import org.eclipse.statet.docmlet.wikitext.core.source.MarkupLanguagePartitioner;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.MarkupLanguageDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.MarkupLanguagePartitioner;
import org.eclipse.statet.ltk.core.Ltk;
import org.eclipse.statet.ltk.model.core.LtkModels;
import org.eclipse.statet.ltk.model.core.ModelManager;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/WikidocReconciler.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/WikidocReconciler.java
index 5e3ded0..09cb3a4 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/WikidocReconciler.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/WikidocReconciler.java
@@ -52,7 +52,7 @@
import org.eclipse.statet.docmlet.wikitext.core.model.build.WikidocSourceUnitModelContainer;
import org.eclipse.statet.docmlet.wikitext.core.project.WikitextProject;
import org.eclipse.statet.docmlet.wikitext.core.project.WikitextProjects;
-import org.eclipse.statet.docmlet.wikitext.core.source.MarkupLanguageDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.MarkupLanguageDocumentSetupParticipant;
import org.eclipse.statet.docmlet.wikitext.core.source.extdoc.ExtdocMarkupLanguage;
import org.eclipse.statet.internal.docmlet.wikitext.core.WikitextCorePlugin;
import org.eclipse.statet.ltk.core.Ltk;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/MarkupTokenScanner.java b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/MarkupTokenScanner.java
index 8486bc3..e800db9 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/MarkupTokenScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/MarkupTokenScanner.java
@@ -45,7 +45,7 @@
import org.eclipse.statet.docmlet.wikitext.core.markup.MarkupParser2;
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguage;
import org.eclipse.statet.docmlet.wikitext.core.source.EmbeddingAttributes;
-import org.eclipse.statet.docmlet.wikitext.core.source.MarkupLanguageDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.MarkupLanguageDocumentSetupParticipant;
import org.eclipse.statet.docmlet.wikitext.core.source.extdoc.ExtdocMarkupLanguage;
import org.eclipse.statet.internal.docmlet.wikitext.ui.sourceediting.EmbeddedHtml;
import org.eclipse.statet.internal.docmlet.wikitext.ui.sourceediting.MarkupCssStyleManager;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/WikidocSourceViewerConfiguration.java b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/WikidocSourceViewerConfiguration.java
index a87810a..4774350 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/WikidocSourceViewerConfiguration.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/WikidocSourceViewerConfiguration.java
@@ -43,9 +43,9 @@
import org.eclipse.statet.docmlet.wikitext.core.WikitextCore;
import org.eclipse.statet.docmlet.wikitext.core.WikitextCoreAccess;
import org.eclipse.statet.docmlet.wikitext.core.source.MarkupBracketPairMatcher;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikidocDocumentContentInfo;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikitextDocumentConstants;
import org.eclipse.statet.docmlet.wikitext.core.source.WikitextHeuristicTokenScanner;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikidocDocumentContentInfo;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextDocumentConstants;
import org.eclipse.statet.internal.docmlet.wikitext.ui.WikitextUIPlugin;
import org.eclipse.statet.internal.docmlet.wikitext.ui.sourceediting.DocQuickOutlineInformationProvider;
import org.eclipse.statet.internal.docmlet.wikitext.ui.sourceediting.MarkupAutoEditStrategy;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/WikidocSourceViewerConfigurator.java b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/WikidocSourceViewerConfigurator.java
index b00e21d..884dc32 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/WikidocSourceViewerConfigurator.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/docmlet/wikitext/ui/sourceediting/WikidocSourceViewerConfigurator.java
@@ -36,7 +36,7 @@
import org.eclipse.statet.docmlet.wikitext.core.WikitextCore;
import org.eclipse.statet.docmlet.wikitext.core.WikitextCoreAccess;
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguage;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikidocDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikidocDocumentSetupParticipant;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfigurator;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupAutoEditStrategy.java b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupAutoEditStrategy.java
index 1ce356d..9a5c1c6 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupAutoEditStrategy.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupAutoEditStrategy.java
@@ -16,7 +16,7 @@
import static org.eclipse.statet.ecommons.text.ui.BracketLevel.AUTODELETE;
-import static org.eclipse.statet.docmlet.wikitext.core.source.WikitextDocumentConstants.WIKIDOC_DEFAULT_CONTENT_CONSTRAINT;
+import static org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextDocumentConstants.WIKIDOC_DEFAULT_CONTENT_CONSTRAINT;
import java.util.Map;
import java.util.Set;
@@ -64,10 +64,10 @@
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguage;
import org.eclipse.statet.docmlet.wikitext.core.source.HardLineWrap;
import org.eclipse.statet.docmlet.wikitext.core.source.MarkupSourceFormatAdapter;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikidocDocumentSetupParticipant;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikitextDocumentConstants;
import org.eclipse.statet.docmlet.wikitext.core.source.WikitextHeuristicTokenScanner;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikitextPartitionNodeType;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikidocDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextDocumentConstants;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextPartitionNodeType;
import org.eclipse.statet.docmlet.wikitext.core.source.extdoc.AbstractMarkupConfig;
import org.eclipse.statet.docmlet.wikitext.core.source.extdoc.ExtdocMarkupLanguage;
import org.eclipse.statet.docmlet.wikitext.ui.sourceediting.WikitextEditingSettings;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupDoubleClickStrategy.java b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupDoubleClickStrategy.java
index a41510c..0234816 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupDoubleClickStrategy.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupDoubleClickStrategy.java
@@ -26,7 +26,7 @@
import org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartition;
import org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartitionNode;
-import org.eclipse.statet.docmlet.wikitext.core.source.WikitextDocumentConstants;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.WikitextDocumentConstants;
public class MarkupDoubleClickStrategy extends DefaultTextDoubleClickStrategy {
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupLabelCompletionComputer.java b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupLabelCompletionComputer.java
index 6e1ca26..60d8610 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupLabelCompletionComputer.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/MarkupLabelCompletionComputer.java
@@ -38,7 +38,7 @@
import org.eclipse.statet.docmlet.wikitext.core.model.WikitextElement;
import org.eclipse.statet.docmlet.wikitext.core.model.WikitextNameAccess;
import org.eclipse.statet.docmlet.wikitext.core.model.WikitextSourceElement;
-import org.eclipse.statet.docmlet.wikitext.core.source.MarkupLanguageDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.MarkupLanguageDocumentSetupParticipant;
import org.eclipse.statet.docmlet.wikitext.ui.sourceediting.MarkupCompletionExtension;
import org.eclipse.statet.ltk.model.core.element.NameAccessSet;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor;
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/WikitextTemplateAssistComputer.java b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/WikitextTemplateAssistComputer.java
index e0aec3c..bf8fe85 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/WikitextTemplateAssistComputer.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.ui/src/org/eclipse/statet/internal/docmlet/wikitext/ui/sourceediting/WikitextTemplateAssistComputer.java
@@ -23,7 +23,7 @@
import org.eclipse.statet.jcommons.text.core.TextRegion;
import org.eclipse.statet.docmlet.wikitext.core.markup.WikitextMarkupLanguage;
-import org.eclipse.statet.docmlet.wikitext.core.source.MarkupLanguageDocumentSetupParticipant;
+import org.eclipse.statet.docmlet.wikitext.core.source.doc.MarkupLanguageDocumentSetupParticipant;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor;
import org.eclipse.statet.ltk.ui.sourceediting.assist.AssistInvocationContext;
import org.eclipse.statet.ltk.ui.sourceediting.assist.ContentAssist;
diff --git a/yaml/org.eclipse.statet.yaml.core/META-INF/MANIFEST.MF b/yaml/org.eclipse.statet.yaml.core/META-INF/MANIFEST.MF
index 85ccc1d..dd5b9db 100644
--- a/yaml/org.eclipse.statet.yaml.core/META-INF/MANIFEST.MF
+++ b/yaml/org.eclipse.statet.yaml.core/META-INF/MANIFEST.MF
@@ -31,4 +31,5 @@
org.eclipse.statet.yaml.core.project,
org.eclipse.statet.yaml.core.refactoring,
org.eclipse.statet.yaml.core.source,
- org.eclipse.statet.yaml.core.source.ast
+ org.eclipse.statet.yaml.core.source.ast,
+ org.eclipse.statet.yaml.core.source.doc
diff --git a/yaml/org.eclipse.statet.yaml.core/plugin.xml b/yaml/org.eclipse.statet.yaml.core/plugin.xml
index 6f7f5bf..df0f27d 100644
--- a/yaml/org.eclipse.statet.yaml.core/plugin.xml
+++ b/yaml/org.eclipse.statet.yaml.core/plugin.xml
@@ -39,7 +39,7 @@
point="org.eclipse.core.filebuffers.documentSetup">
<participant
contentTypeId="org.eclipse.statet.yaml.contentTypes.Yaml"
- class="org.eclipse.statet.yaml.core.source.YamlDocumentSetupParticipant">
+ class="org.eclipse.statet.yaml.core.source.doc.YamlDocumentSetupParticipant">
</participant>
</extension>
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/internal/yaml/core/model/YamlFragmentSourceUnit.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/internal/yaml/core/model/YamlFragmentSourceUnit.java
index 7e56df4..695f0b2 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/internal/yaml/core/model/YamlFragmentSourceUnit.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/internal/yaml/core/model/YamlFragmentSourceUnit.java
@@ -27,7 +27,7 @@
import org.eclipse.statet.yaml.core.YamlCoreAccess;
import org.eclipse.statet.yaml.core.model.YamlModel;
import org.eclipse.statet.yaml.core.model.build.YamlSourceUnitModelContainer;
-import org.eclipse.statet.yaml.core.source.YamlDocumentContentInfo;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentContentInfo;
@NonNullByDefault
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/model/YamlResourceSourceUnit.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/model/YamlResourceSourceUnit.java
index ce5c445..110350c 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/model/YamlResourceSourceUnit.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/model/YamlResourceSourceUnit.java
@@ -22,7 +22,7 @@
import org.eclipse.statet.ltk.model.core.element.SourceUnit;
import org.eclipse.statet.ltk.model.core.impl.GenericResourceSourceUnit;
-import org.eclipse.statet.yaml.core.source.YamlDocumentContentInfo;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentContentInfo;
@NonNullByDefault
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/refactoring/YamlRefactoringAdapter.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/refactoring/YamlRefactoringAdapter.java
index f15b42c..13cc32b 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/refactoring/YamlRefactoringAdapter.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/refactoring/YamlRefactoringAdapter.java
@@ -20,8 +20,8 @@
import org.eclipse.statet.ltk.refactoring.core.RefactoringAdapter;
import org.eclipse.statet.yaml.core.YamlCore;
import org.eclipse.statet.yaml.core.model.YamlModel;
-import org.eclipse.statet.yaml.core.source.YamlDocumentConstants;
import org.eclipse.statet.yaml.core.source.YamlHeuristicTokenScanner;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentConstants;
public class YamlRefactoringAdapter extends RefactoringAdapter {
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlBracketPairMatcher.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlBracketPairMatcher.java
index 86c4f72..05b66b9 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlBracketPairMatcher.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlBracketPairMatcher.java
@@ -18,6 +18,8 @@
import org.eclipse.statet.ecommons.text.PairMatcher;
import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentConstants;
+
/**
* A pair finder class for implementing the pair matching.
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlChunkHeuristicTokenScanner.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlChunkHeuristicTokenScanner.java
index eccf284..c8d45af 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlChunkHeuristicTokenScanner.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlChunkHeuristicTokenScanner.java
@@ -24,6 +24,9 @@
import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartitionUtils;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentConstants;
+import org.eclipse.statet.yaml.core.source.doc.YamlPartitionNodeType;
+
public class YamlChunkHeuristicTokenScanner extends YamlHeuristicTokenScanner {
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlHeuristicTokenScanner.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlHeuristicTokenScanner.java
index bca7bf8..e5ee370 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlHeuristicTokenScanner.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlHeuristicTokenScanner.java
@@ -17,6 +17,8 @@
import org.eclipse.statet.ecommons.text.BasicHeuristicTokenScanner;
import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentConstants;
+
public class YamlHeuristicTokenScanner extends BasicHeuristicTokenScanner {
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlDocumentConstants.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlDocumentConstants.java
similarity index 97%
rename from yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlDocumentConstants.java
rename to yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlDocumentConstants.java
index e7e4a05..d698198 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlDocumentConstants.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlDocumentConstants.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.yaml.core.source;
+package org.eclipse.statet.yaml.core.source.doc;
import org.eclipse.statet.jcommons.collections.ImCollections;
import org.eclipse.statet.jcommons.collections.ImList;
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlDocumentContentInfo.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlDocumentContentInfo.java
similarity index 96%
rename from yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlDocumentContentInfo.java
rename to yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlDocumentContentInfo.java
index da33e01..e0cb1e0 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlDocumentContentInfo.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlDocumentContentInfo.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.yaml.core.source;
+package org.eclipse.statet.yaml.core.source.doc;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlDocumentSetupParticipant.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlDocumentSetupParticipant.java
similarity index 96%
rename from yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlDocumentSetupParticipant.java
rename to yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlDocumentSetupParticipant.java
index f1f57a5..e9e6b64 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlDocumentSetupParticipant.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlDocumentSetupParticipant.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.yaml.core.source;
+package org.eclipse.statet.yaml.core.source.doc;
import org.eclipse.jface.text.IDocumentPartitioner;
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlPartitionNodeScanner.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlPartitionNodeScanner.java
similarity index 99%
rename from yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlPartitionNodeScanner.java
rename to yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlPartitionNodeScanner.java
index 706a88b..16b07cd 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlPartitionNodeScanner.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlPartitionNodeScanner.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.yaml.core.source;
+package org.eclipse.statet.yaml.core.source.doc;
import java.util.ArrayDeque;
import java.util.Deque;
diff --git a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlPartitionNodeType.java b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlPartitionNodeType.java
similarity index 98%
rename from yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlPartitionNodeType.java
rename to yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlPartitionNodeType.java
index 715c26a..e558d7f 100644
--- a/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/YamlPartitionNodeType.java
+++ b/yaml/org.eclipse.statet.yaml.core/src/org/eclipse/statet/yaml/core/source/doc/YamlPartitionNodeType.java
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================*/
-package org.eclipse.statet.yaml.core.source;
+package org.eclipse.statet.yaml.core.source.doc;
import org.eclipse.jface.text.IDocument;
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/YamlEditorUriSourceUnit.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/YamlEditorUriSourceUnit.java
index ba5fba3..9b92edf 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/YamlEditorUriSourceUnit.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/YamlEditorUriSourceUnit.java
@@ -31,7 +31,7 @@
import org.eclipse.statet.ltk.model.core.impl.WorkingBuffer;
import org.eclipse.statet.ltk.ui.FileBufferWorkingBuffer;
import org.eclipse.statet.yaml.core.model.YamlModel;
-import org.eclipse.statet.yaml.core.source.YamlDocumentContentInfo;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentContentInfo;
@NonNullByDefault
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlEditorTemplatesPreferencePage.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlEditorTemplatesPreferencePage.java
index b20e55f..670a2fb 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlEditorTemplatesPreferencePage.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlEditorTemplatesPreferencePage.java
@@ -23,7 +23,7 @@
import org.eclipse.statet.internal.yaml.ui.YamlUIPlugin;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfigurator;
import org.eclipse.statet.ltk.ui.templates.config.AbstractTemplatesPreferencePage;
-import org.eclipse.statet.yaml.core.source.YamlPartitionNodeType;
+import org.eclipse.statet.yaml.core.source.doc.YamlPartitionNodeType;
import org.eclipse.statet.yaml.ui.sourceediting.YamlTemplateSourceViewerConfigurator;
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlTextStylesPreferencePage.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlTextStylesPreferencePage.java
index fa53429..a5203e8 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlTextStylesPreferencePage.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlTextStylesPreferencePage.java
@@ -33,8 +33,8 @@
import org.eclipse.statet.ltk.ui.sourceediting.presentation.AbstractTextStylesConfigurationBlock;
import org.eclipse.statet.ltk.ui.util.CombinedPreferenceStore;
import org.eclipse.statet.yaml.core.YamlCore;
-import org.eclipse.statet.yaml.core.source.YamlDocumentContentInfo;
-import org.eclipse.statet.yaml.core.source.YamlDocumentSetupParticipant;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentContentInfo;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentSetupParticipant;
import org.eclipse.statet.yaml.ui.sourceediting.YamlSourceViewerConfiguration;
import org.eclipse.statet.yaml.ui.text.YamlTextStyles;
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlDocumentProvider.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlDocumentProvider.java
index f9773f8..4dd2d9f 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlDocumentProvider.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlDocumentProvider.java
@@ -35,7 +35,7 @@
import org.eclipse.statet.ltk.ui.sourceediting.SourceAnnotationModel;
import org.eclipse.statet.ltk.ui.sourceediting.SourceDocumentProvider;
import org.eclipse.statet.yaml.core.model.YamlModel;
-import org.eclipse.statet.yaml.core.source.YamlDocumentSetupParticipant;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentSetupParticipant;
import org.eclipse.statet.yaml.ui.editors.YamlEditorBuild;
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlEditor.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlEditor.java
index dfd9241..54e3de1 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlEditor.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlEditor.java
@@ -30,7 +30,7 @@
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfigurator;
import org.eclipse.statet.yaml.core.YamlCore;
import org.eclipse.statet.yaml.core.model.YamlModel;
-import org.eclipse.statet.yaml.core.source.YamlDocumentContentInfo;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentContentInfo;
import org.eclipse.statet.yaml.ui.sourceediting.YamlEditingSettings;
import org.eclipse.statet.yaml.ui.sourceediting.YamlSourceViewerConfiguration;
import org.eclipse.statet.yaml.ui.sourceediting.YamlSourceViewerConfigurator;
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlMergeViewer.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlMergeViewer.java
index 5a11660..5e09cd7 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlMergeViewer.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlMergeViewer.java
@@ -22,7 +22,7 @@
import org.eclipse.statet.ltk.ui.compare.CompareMergeTextViewer;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfiguration;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfigurator;
-import org.eclipse.statet.yaml.core.source.YamlDocumentSetupParticipant;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentSetupParticipant;
import org.eclipse.statet.yaml.ui.sourceediting.YamlSourceViewerConfiguration;
import org.eclipse.statet.yaml.ui.sourceediting.YamlSourceViewerConfigurator;
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/sourceediting/YamlAutoEditStrategy.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/sourceediting/YamlAutoEditStrategy.java
index 7cf7126..213719c 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/sourceediting/YamlAutoEditStrategy.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/sourceediting/YamlAutoEditStrategy.java
@@ -16,10 +16,10 @@
import static org.eclipse.statet.ecommons.text.ui.BracketLevel.AUTODELETE;
-import static org.eclipse.statet.yaml.core.source.YamlDocumentConstants.YAML_ANY_CONTENT_CONSTRAINT;
-import static org.eclipse.statet.yaml.core.source.YamlDocumentConstants.YAML_DEFAULT_CONTENT_CONSTRAINT;
import static org.eclipse.statet.yaml.core.source.YamlHeuristicTokenScanner.CURLY_BRACKET_TYPE;
import static org.eclipse.statet.yaml.core.source.YamlHeuristicTokenScanner.SQUARE_BRACKET_TYPE;
+import static org.eclipse.statet.yaml.core.source.doc.YamlDocumentConstants.YAML_ANY_CONTENT_CONSTRAINT;
+import static org.eclipse.statet.yaml.core.source.doc.YamlDocumentConstants.YAML_DEFAULT_CONTENT_CONSTRAINT;
import java.util.Map;
import java.util.Set;
@@ -55,9 +55,9 @@
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor;
import org.eclipse.statet.yaml.core.YamlCodeStyleSettings;
import org.eclipse.statet.yaml.core.YamlCoreAccess;
-import org.eclipse.statet.yaml.core.source.YamlDocumentConstants;
import org.eclipse.statet.yaml.core.source.YamlHeuristicTokenScanner;
-import org.eclipse.statet.yaml.core.source.YamlPartitionNodeType;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentConstants;
+import org.eclipse.statet.yaml.core.source.doc.YamlPartitionNodeType;
import org.eclipse.statet.yaml.ui.sourceediting.YamlEditingSettings;
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfiguration.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfiguration.java
index 40b51f3..6ba600f 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfiguration.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfiguration.java
@@ -55,9 +55,9 @@
import org.eclipse.statet.yaml.core.YamlCore;
import org.eclipse.statet.yaml.core.YamlCoreAccess;
import org.eclipse.statet.yaml.core.source.YamlBracketPairMatcher;
-import org.eclipse.statet.yaml.core.source.YamlDocumentConstants;
-import org.eclipse.statet.yaml.core.source.YamlDocumentContentInfo;
import org.eclipse.statet.yaml.core.source.YamlHeuristicTokenScanner;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentConstants;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentContentInfo;
import org.eclipse.statet.yaml.ui.text.YamlDefaultTextStyleScanner;
import org.eclipse.statet.yaml.ui.text.YamlDoubleClickStrategy;
import org.eclipse.statet.yaml.ui.text.YamlTextStyles;
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfigurator.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfigurator.java
index 1c31533..652b280 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfigurator.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfigurator.java
@@ -32,7 +32,7 @@
import org.eclipse.statet.yaml.core.YamlCodeStyleSettings;
import org.eclipse.statet.yaml.core.YamlCore;
import org.eclipse.statet.yaml.core.YamlCoreAccess;
-import org.eclipse.statet.yaml.core.source.YamlDocumentSetupParticipant;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentSetupParticipant;
/**
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlTemplateSourceViewerConfigurator.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlTemplateSourceViewerConfigurator.java
index 319b8a7..d1a530e 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlTemplateSourceViewerConfigurator.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlTemplateSourceViewerConfigurator.java
@@ -20,7 +20,7 @@
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfiguration;
import org.eclipse.statet.yaml.core.YamlCoreAccess;
-import org.eclipse.statet.yaml.core.source.YamlDocumentSetupParticipant;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentSetupParticipant;
public class YamlTemplateSourceViewerConfigurator extends YamlSourceViewerConfigurator {
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/text/YamlDoubleClickStrategy.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/text/YamlDoubleClickStrategy.java
index 4d74930..bd0bdda 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/text/YamlDoubleClickStrategy.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/text/YamlDoubleClickStrategy.java
@@ -26,8 +26,8 @@
import org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartitionNode;
import org.eclipse.statet.yaml.core.source.YamlBracketPairMatcher;
-import org.eclipse.statet.yaml.core.source.YamlDocumentConstants;
import org.eclipse.statet.yaml.core.source.YamlHeuristicTokenScanner;
+import org.eclipse.statet.yaml.core.source.doc.YamlDocumentConstants;
/**
