diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/ClusteringAlgorithms.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/ClusteringAlgorithms.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/ClusteringAlgorithms.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/ClusteringAlgorithms.cs diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/DecorationTextBlockClassifier.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/DecorationTextBlockClassifier.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/DecorationTextBlockClassifier.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/DecorationTextBlockClassifier.cs diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/DefaultPageSegmenter.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/DefaultPageSegmenter.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/DefaultPageSegmenter.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/DefaultPageSegmenter.cs diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/Distances.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Distances.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/Distances.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Distances.cs diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/DocstrumBoundingBoxes.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/DocstrumBoundingBoxes.cs similarity index 97% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/DocstrumBoundingBoxes.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/DocstrumBoundingBoxes.cs index bed0ae19..67f86303 100644 --- a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/DocstrumBoundingBoxes.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/DocstrumBoundingBoxes.cs @@ -1,13 +1,12 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using UglyToad.PdfPig.Content; -using UglyToad.PdfPig.Geometry; - -namespace UglyToad.PdfPig.DocumentLayoutAnalysis +namespace UglyToad.PdfPig.DocumentLayoutAnalysis { + using System; + using System.Collections.Concurrent; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Geometry; + using Content; using Core; /// @@ -252,7 +251,7 @@ namespace UglyToad.PdfPig.DocumentLayoutAnalysis (pivot, candidate) => { // Compare bottom right with bottom left for angle - var withinLineAngle = Distances.Angle(pivot.BoundingBox.BottomRight, candidate.BoundingBox.BottomLeft); + var withinLineAngle = Distances.Angle(pivot.BoundingBox.BottomRight, candidate.BoundingBox.BottomLeft); return (withinLineAngle >= withinLine.Lower && withinLineAngle <= withinLine.Upper); }, @@ -313,7 +312,7 @@ namespace UglyToad.PdfPig.DocumentLayoutAnalysis yield return new TextBlock(groupedIndexes[a].Select(i => lines[i]).ToList()); } } - + /// /// Get the average distance value of the peak bucket of the histogram. /// @@ -331,7 +330,7 @@ namespace UglyToad.PdfPig.DocumentLayoutAnalysis } else { - buckets[floor] = new List {distance}; + buckets[floor] = new List { distance }; } } @@ -339,7 +338,7 @@ namespace UglyToad.PdfPig.DocumentLayoutAnalysis foreach (var bucket in buckets) { - if (best == null || bucket.Value.Count > best.Count) + if (best == null || bucket.Value.Count > best.Count) { best = bucket.Value; } diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoAlternative.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoAlternative.cs similarity index 92% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoAlternative.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoAlternative.cs index da52cf50..0537ddeb 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoAlternative.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoAlternative.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoBlock.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoBlock.cs similarity index 98% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoBlock.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoBlock.cs index 0bb818cd..974a040e 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoBlock.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoBlock.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoBlockTypeActuate.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoBlockTypeActuate.cs similarity index 92% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoBlockTypeActuate.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoBlockTypeActuate.cs index 98f9b80b..031ae6d4 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoBlockTypeActuate.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoBlockTypeActuate.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoBlockTypeShow.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoBlockTypeShow.cs similarity index 92% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoBlockTypeShow.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoBlockTypeShow.cs index f722fa9f..bfa9dee1 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoBlockTypeShow.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoBlockTypeShow.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoCircle.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoCircle.cs similarity index 93% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoCircle.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoCircle.cs index 3e6a568d..de2033ce 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoCircle.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoCircle.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoComposedBlock.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoComposedBlock.cs similarity index 96% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoComposedBlock.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoComposedBlock.cs index fa657c75..f828f676 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoComposedBlock.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoComposedBlock.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDescription.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDescription.cs similarity index 94% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDescription.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDescription.cs index 634a7b3e..487cf702 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDescription.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDescription.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDescriptionOcrProcessing.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDescriptionOcrProcessing.cs similarity index 92% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDescriptionOcrProcessing.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDescriptionOcrProcessing.cs index d37f1e75..fcdd5d20 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDescriptionOcrProcessing.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDescriptionOcrProcessing.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDescriptionProcessing.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDescriptionProcessing.cs similarity index 92% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDescriptionProcessing.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDescriptionProcessing.cs index 4dcd9941..5c014cbe 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDescriptionProcessing.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDescriptionProcessing.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDocumentIdentifier.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDocumentIdentifier.cs similarity index 94% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDocumentIdentifier.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDocumentIdentifier.cs index 03dd67fe..77199eb9 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoDocumentIdentifier.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoDocumentIdentifier.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoEllipse.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoEllipse.cs similarity index 96% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoEllipse.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoEllipse.cs index a5f8a19f..615dafa7 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoEllipse.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoEllipse.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFileIdentifier.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFileIdentifier.cs similarity index 94% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFileIdentifier.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFileIdentifier.cs index 9cd000ac..51e0b18f 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFileIdentifier.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFileIdentifier.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFontStyles.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFontStyles.cs similarity index 95% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFontStyles.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFontStyles.cs index 5d6a6eec..0d460bc5 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFontStyles.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFontStyles.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFontType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFontType.cs similarity index 91% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFontType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFontType.cs index dbf7f2e2..21d56369 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFontType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFontType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFontWidth.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFontWidth.cs similarity index 91% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFontWidth.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFontWidth.cs index 88e7a2f5..26313bf1 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoFontWidth.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoFontWidth.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoGlyph.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoGlyph.cs similarity index 98% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoGlyph.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoGlyph.cs index 3f08a357..f159027b 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoGlyph.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoGlyph.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoGraphicalElement.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoGraphicalElement.cs similarity index 89% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoGraphicalElement.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoGraphicalElement.cs index 87b83f9c..2a6f37a7 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoGraphicalElement.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoGraphicalElement.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoIllustration.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoIllustration.cs similarity index 93% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoIllustration.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoIllustration.cs index 15640ff8..7b9e9f1a 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoIllustration.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoIllustration.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoItemsChoice.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoItemsChoice.cs similarity index 96% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoItemsChoice.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoItemsChoice.cs index 300acb70..c7cbbe7b 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoItemsChoice.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoItemsChoice.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoLayout.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoLayout.cs similarity index 91% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoLayout.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoLayout.cs index 1a812990..84cff094 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoLayout.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoLayout.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoMeasurementUnit.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoMeasurementUnit.cs similarity index 96% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoMeasurementUnit.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoMeasurementUnit.cs index ed38720b..a10b66af 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoMeasurementUnit.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoMeasurementUnit.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoOcrProcessing.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoOcrProcessing.cs similarity index 93% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoOcrProcessing.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoOcrProcessing.cs index 285c9869..d239bb94 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoOcrProcessing.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoOcrProcessing.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPage.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPage.cs similarity index 98% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPage.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPage.cs index 9268498e..ad5842c5 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPage.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPage.cs @@ -1,9 +1,8 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; using System.Diagnostics; - using System.Xml; using System.Xml.Serialization; public partial class AltoDocument diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPageSpace.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPageSpace.cs similarity index 96% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPageSpace.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPageSpace.cs index 18cc41e2..fab62791 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPageSpace.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPageSpace.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoParagraphStyle.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoParagraphStyle.cs similarity index 98% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoParagraphStyle.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoParagraphStyle.cs index 2192de1c..2ab17ca9 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoParagraphStyle.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoParagraphStyle.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoParagraphStyleAlign.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoParagraphStyleAlign.cs similarity index 91% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoParagraphStyleAlign.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoParagraphStyleAlign.cs index f3d20f66..ed8cb1f3 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoParagraphStyleAlign.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoParagraphStyleAlign.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPolygon.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPolygon.cs similarity index 90% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPolygon.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPolygon.cs index 0964713b..f79aa28c 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPolygon.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPolygon.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPosition.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPosition.cs similarity index 94% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPosition.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPosition.cs index 700a7bfa..92d3078a 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPosition.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPosition.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPositionedElement.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPositionedElement.cs similarity index 97% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPositionedElement.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPositionedElement.cs index 51e462ff..6d0d0e0c 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoPositionedElement.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoPositionedElement.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoProcessingCategory.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoProcessingCategory.cs similarity index 95% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoProcessingCategory.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoProcessingCategory.cs index 7fca2bdf..0ceb014e 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoProcessingCategory.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoProcessingCategory.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoProcessingSoftware.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoProcessingSoftware.cs similarity index 96% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoProcessingSoftware.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoProcessingSoftware.cs index 1bafa449..b9d4e645 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoProcessingSoftware.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoProcessingSoftware.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoProcessingStep.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoProcessingStep.cs similarity index 97% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoProcessingStep.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoProcessingStep.cs index 84495520..ef812a8b 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoProcessingStep.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoProcessingStep.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoQuality.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoQuality.cs similarity index 93% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoQuality.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoQuality.cs index c3110c14..55721a60 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoQuality.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoQuality.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoSP.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoSP.cs similarity index 91% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoSP.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoSP.cs index 597c10c4..8cd9f5e3 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoSP.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoSP.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoShape.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoShape.cs similarity index 92% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoShape.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoShape.cs index 976a1ff4..c2c8e135 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoShape.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoShape.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoSourceImageInformation.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoSourceImageInformation.cs similarity index 93% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoSourceImageInformation.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoSourceImageInformation.cs index ff223295..93571280 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoSourceImageInformation.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoSourceImageInformation.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoString.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoString.cs similarity index 98% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoString.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoString.cs index 8c09d7f5..c833377e 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoString.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoString.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoStyles.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoStyles.cs similarity index 93% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoStyles.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoStyles.cs index b1389831..75bfd0d2 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoStyles.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoStyles.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoSubsType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoSubsType.cs similarity index 90% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoSubsType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoSubsType.cs index 665af9b5..108b1cc7 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoSubsType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoSubsType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTag.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTag.cs similarity index 97% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTag.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTag.cs index 504c0195..6d2ed025 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTag.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTag.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTagXmlData.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTagXmlData.cs similarity index 95% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTagXmlData.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTagXmlData.cs index bbb7eb90..957f13e0 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTagXmlData.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTagXmlData.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTags.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTags.cs similarity index 96% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTags.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTags.cs index 874f33f8..facaa778 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTags.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTags.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextBlock.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextBlock.cs similarity index 95% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextBlock.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextBlock.cs index 8c396508..8b0bad25 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextBlock.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextBlock.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextBlockTextLine.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextBlockTextLine.cs similarity index 97% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextBlockTextLine.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextBlockTextLine.cs index a38749e8..35483dce 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextBlockTextLine.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextBlockTextLine.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextBlockTextLineHyp.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextBlockTextLineHyp.cs similarity index 92% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextBlockTextLineHyp.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextBlockTextLineHyp.cs index 2c0caa93..3e57e4cf 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextBlockTextLineHyp.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextBlockTextLineHyp.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextStyle.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextStyle.cs similarity index 97% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextStyle.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextStyle.cs index 5c8928ba..f921b370 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoTextStyle.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoTextStyle.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoVariant.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoVariant.cs similarity index 97% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoVariant.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoVariant.cs index e1c78846..c8de7354 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.AltoVariant.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.AltoVariant.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.cs similarity index 96% rename from src/UglyToad.PdfPig/Export/Alto/AltoDocument.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.cs index 6b5be0bc..e792b186 100644 --- a/src/UglyToad.PdfPig/Export/Alto/AltoDocument.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/Alto/AltoDocument.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.Alto +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.Alto { using System; using System.ComponentModel; diff --git a/src/UglyToad.PdfPig/Export/AltoXmlTextExporter.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/AltoXmlTextExporter.cs similarity index 99% rename from src/UglyToad.PdfPig/Export/AltoXmlTextExporter.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/AltoXmlTextExporter.cs index 09c045ba..0ab8faac 100644 --- a/src/UglyToad.PdfPig/Export/AltoXmlTextExporter.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/AltoXmlTextExporter.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export { using System; using System.Globalization; diff --git a/src/UglyToad.PdfPig/Export/HOcrTextExporter.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/HOcrTextExporter.cs similarity index 99% rename from src/UglyToad.PdfPig/Export/HOcrTextExporter.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/HOcrTextExporter.cs index 1f31555a..9000e21f 100644 --- a/src/UglyToad.PdfPig/Export/HOcrTextExporter.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/HOcrTextExporter.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export { using System; using System.Linq; diff --git a/src/UglyToad.PdfPig/Export/ITextExporter.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/ITextExporter.cs similarity index 89% rename from src/UglyToad.PdfPig/Export/ITextExporter.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/ITextExporter.cs index 655211e1..497bf072 100644 --- a/src/UglyToad.PdfPig/Export/ITextExporter.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/ITextExporter.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export { using Content; diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlAdvertRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlAdvertRegion.cs similarity index 83% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlAdvertRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlAdvertRegion.cs index f137e828..fb86a926 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlAdvertRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlAdvertRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Regions containing advertisements. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlAdvertRegion : PageXmlRegion { @@ -35,7 +35,7 @@ /// (negative values indicate anti-clockwise rotation). /// Range: -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -50,7 +50,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -66,7 +66,7 @@ /// /// The background colour of the region /// - [XmlAttributeAttribute("bgColour")] + [XmlAttribute("bgColour")] public PageXmlColourSimpleType BgColour { get @@ -81,7 +81,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool BgColourSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlAlignSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlAlignSimpleType.cs similarity index 57% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlAlignSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlAlignSimpleType.cs index 2f19c958..dc852bbd 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlAlignSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlAlignSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,26 +9,26 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlAlignSimpleType { /// - [XmlEnumAttribute("left")] + [XmlEnum("left")] Left, /// - [XmlEnumAttribute("centre")] + [XmlEnum("centre")] Centre, /// - [XmlEnumAttribute("right")] + [XmlEnum("right")] Right, /// - [XmlEnumAttribute("justify")] + [XmlEnum("justify")] Justify, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlAlternativeImage.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlAlternativeImage.cs similarity index 79% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlAlternativeImage.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlAlternativeImage.cs index 4487a1af..c690a0ce 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlAlternativeImage.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlAlternativeImage.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlAlternativeImage { @@ -27,7 +27,7 @@ private bool confFieldSpecified; /// - [XmlAttributeAttribute("filename")] + [XmlAttribute("filename")] public string FileName { get @@ -41,7 +41,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get @@ -57,7 +57,7 @@ /// /// Confidence value (between 0 and 1) /// - [XmlAttributeAttribute("conf")] + [XmlAttribute("conf")] public float Conf { get @@ -72,7 +72,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ConfSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlBaseline.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlBaseline.cs similarity index 77% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlBaseline.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlBaseline.cs index 90f9e1f5..f4d73c09 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlBaseline.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlBaseline.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlBaseline { @@ -25,7 +25,7 @@ private bool confFieldSpecified; /// - [XmlAttributeAttribute("points")] + [XmlAttribute("points")] public string Points { get @@ -41,7 +41,7 @@ /// /// Confidence value (between 0 and 1) /// - [XmlAttributeAttribute("conf")] + [XmlAttribute("conf")] public float Conf { get @@ -56,7 +56,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ConfSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlBorder.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlBorder.cs similarity index 72% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlBorder.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlBorder.cs index 252a3578..4e67bc6b 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlBorder.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlBorder.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -13,11 +13,11 @@ /// contains parts not belonging to the page). /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlBorder { diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlChartRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlChartRegion.cs similarity index 87% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlChartRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlChartRegion.cs index 775e71b5..42bdfe48 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlChartRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlChartRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Regions containing charts or graphs of any type, should be marked as chart regions. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlChartRegion : PageXmlRegion { #region private @@ -48,7 +48,7 @@ /// (negative values indicate anti-clockwise rotation). /// Range: -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -63,7 +63,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -79,7 +79,7 @@ /// /// The type of chart in the region /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlChartSimpleType Type { get @@ -94,7 +94,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -110,7 +110,7 @@ /// /// An approximation of the number of colours used in the region /// - [XmlAttributeAttribute("numColours")] + [XmlAttribute("numColours")] public int NumColours { get @@ -125,7 +125,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool NumColoursSpecified { get @@ -141,7 +141,7 @@ /// /// The background colour of the region /// - [XmlAttributeAttribute("bgColour")] + [XmlAttribute("bgColour")] public PageXmlColourSimpleType BgColour { get @@ -156,7 +156,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool BgColourSpecified { get @@ -172,7 +172,7 @@ /// /// Specifies whether the region also contains text /// - [XmlAttributeAttribute("embText")] + [XmlAttribute("embText")] public bool EmbText { get @@ -187,7 +187,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool EmbTextSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlChartSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlChartSimpleType.cs similarity index 56% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlChartSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlChartSimpleType.cs index 3f765387..2bbd6899 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlChartSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlChartSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,34 +9,34 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlChartSimpleType { /// - [XmlEnumAttribute("bar")] + [XmlEnum("bar")] Bar, /// - [XmlEnumAttribute("line")] + [XmlEnum("line")] Line, /// - [XmlEnumAttribute("pie")] + [XmlEnum("pie")] Pie, /// - [XmlEnumAttribute("scatter")] + [XmlEnum("scatter")] Scatter, /// - [XmlEnumAttribute("surface")] + [XmlEnum("surface")] Surface, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlChemRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlChemRegion.cs similarity index 83% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlChemRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlChemRegion.cs index 22e9f064..d3eaa664 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlChemRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlChemRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Regions containing chemical formulas. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlChemRegion : PageXmlRegion { @@ -36,7 +36,7 @@ /// anti-clockwise rotation). Range: /// -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -51,7 +51,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -67,7 +67,7 @@ /// /// The background colour of the region /// - [XmlAttributeAttribute("bgColour")] + [XmlAttribute("bgColour")] public PageXmlColourSimpleType BgColour { get @@ -82,7 +82,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool BgColourSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlColourDepthSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlColourDepthSimpleType.cs similarity index 57% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlColourDepthSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlColourDepthSimpleType.cs index 82faa52e..8f8325b2 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlColourDepthSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlColourDepthSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,26 +9,26 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlColourDepthSimpleType { /// - [XmlEnumAttribute("bilevel")] + [XmlEnum("bilevel")] BiLevel, /// - [XmlEnumAttribute("greyscale")] + [XmlEnum("greyscale")] GreyScale, /// - [XmlEnumAttribute("colour")] + [XmlEnum("colour")] Colour, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlColourSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlColourSimpleType.cs similarity index 55% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlColourSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlColourSimpleType.cs index b111abdf..46fd6669 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlColourSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlColourSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,74 +9,74 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlColourSimpleType { /// - [XmlEnumAttribute("black")] + [XmlEnum("black")] Black, /// - [XmlEnumAttribute("blue")] + [XmlEnum("blue")] Blue, /// - [XmlEnumAttribute("brown")] + [XmlEnum("brown")] Brown, /// - [XmlEnumAttribute("cyan")] + [XmlEnum("cyan")] Cyan, /// - [XmlEnumAttribute("green")] + [XmlEnum("green")] Green, /// - [XmlEnumAttribute("grey")] + [XmlEnum("grey")] Grey, /// - [XmlEnumAttribute("indigo")] + [XmlEnum("indigo")] Indigo, /// - [XmlEnumAttribute("magenta")] + [XmlEnum("magenta")] Magenta, /// - [XmlEnumAttribute("orange")] + [XmlEnum("orange")] Orange, /// - [XmlEnumAttribute("pink")] + [XmlEnum("pink")] Pink, /// - [XmlEnumAttribute("red")] + [XmlEnum("red")] Red, /// - [XmlEnumAttribute("turquoise")] + [XmlEnum("turquoise")] Turquoise, /// - [XmlEnumAttribute("violet")] + [XmlEnum("violet")] Violet, /// - [XmlEnumAttribute("white")] + [XmlEnum("white")] White, /// - [XmlEnumAttribute("yellow")] + [XmlEnum("yellow")] Yellow, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlCoords.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlCoords.cs similarity index 81% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlCoords.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlCoords.cs index 0636f205..2173df58 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlCoords.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlCoords.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlCoords { @@ -33,7 +33,7 @@ /// (and at least 3 points are required to span an area). /// Paths must be planar (i.e.must not self-intersect). /// - [XmlAttributeAttribute("points")] + [XmlAttribute("points")] public string Points { get @@ -49,7 +49,7 @@ /// /// Confidence value (between 0 and 1) /// - [XmlAttributeAttribute("conf")] + [XmlAttribute("conf")] public float Conf { get @@ -64,7 +64,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ConfSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlCustomRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlCustomRegion.cs similarity index 74% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlCustomRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlCustomRegion.cs index 4a9865a2..6e38285c 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlCustomRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlCustomRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -15,11 +15,11 @@ /// map, music, chem, advert, noise, unknown). /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlCustomRegion : PageXmlRegion { @@ -28,7 +28,7 @@ /// /// Information on the type of content represented by this region /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public string Type { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGlyph.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGlyph.cs similarity index 85% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGlyph.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGlyph.cs index ca1b3a09..d88f726c 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGlyph.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGlyph.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlGlyph { #region private @@ -58,7 +58,7 @@ /// /// Alternative glyph images (e.g. black-and-white) /// - [XmlElementAttribute("AlternativeImage")] + [XmlElement("AlternativeImage")] public PageXmlAlternativeImage[] AlternativeImages { get @@ -87,9 +87,9 @@ /// /// Container for graphemes, grapheme groups and non-printing characters /// - [XmlArrayItemAttribute("Grapheme", typeof(PageXmlGrapheme), IsNullable = false)] - [XmlArrayItemAttribute("GraphemeGroup", typeof(PageXmlGraphemeGroup), IsNullable = false)] - [XmlArrayItemAttribute("NonPrintingChar", typeof(PageXmlNonPrintingChar), IsNullable = false)] + [XmlArrayItem("Grapheme", typeof(PageXmlGrapheme), IsNullable = false)] + [XmlArrayItem("GraphemeGroup", typeof(PageXmlGraphemeGroup), IsNullable = false)] + [XmlArrayItem("NonPrintingChar", typeof(PageXmlNonPrintingChar), IsNullable = false)] public PageXmlGraphemeBase[] Graphemes { get @@ -103,7 +103,7 @@ } /// - [XmlElementAttribute("TextEquiv")] + [XmlElement("TextEquiv")] public PageXmlTextEquiv[] TextEquivs { get @@ -130,7 +130,7 @@ } /// - [XmlArrayItemAttribute("UserAttribute", IsNullable = false)] + [XmlArrayItem("UserAttribute", IsNullable = false)] public PageXmlUserAttribute[] UserDefined { get @@ -146,7 +146,7 @@ /// /// Semantic labels / tags /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -160,7 +160,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -174,7 +174,7 @@ } /// - [XmlAttributeAttribute("ligature")] + [XmlAttribute("ligature")] public bool Ligature { get @@ -189,7 +189,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool LigatureSpecified { get @@ -203,7 +203,7 @@ } /// - [XmlAttributeAttribute("symbol")] + [XmlAttribute("symbol")] public bool Symbol { get @@ -218,7 +218,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SymbolSpecified { get @@ -234,7 +234,7 @@ /// /// The script used for the glyph /// - [XmlAttributeAttribute("script")] + [XmlAttribute("script")] public PageXmlScriptSimpleType Script { get @@ -249,7 +249,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ScriptSpecified { get @@ -265,7 +265,7 @@ /// /// Overrides the production attribute of the parent word / text line / text region. /// - [XmlAttributeAttribute("production")] + [XmlAttribute("production")] public PageXmlProductionSimpleType Production { get @@ -280,7 +280,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ProductionSpecified { get @@ -296,7 +296,7 @@ /// /// For generic use /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -310,7 +310,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGrapheme.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGrapheme.cs similarity index 73% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGrapheme.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGrapheme.cs index 4750354e..dddd21ec 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGrapheme.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGrapheme.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Represents a sub-element of a glyph. Smallest graphical unit that can be assigned a Unicode code point. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlGrapheme : PageXmlGraphemeBase { diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphemeBase.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphemeBase.cs similarity index 82% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphemeBase.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphemeBase.cs index 41f9881d..b1e4e847 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphemeBase.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphemeBase.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,14 +12,14 @@ /// Base type for graphemes, grapheme groups and non-printing characters. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [XmlIncludeAttribute(typeof(PageXmlGraphemeGroup))] - [XmlIncludeAttribute(typeof(PageXmlNonPrintingChar))] - [XmlIncludeAttribute(typeof(PageXmlGrapheme))] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [XmlInclude(typeof(PageXmlGraphemeGroup))] + [XmlInclude(typeof(PageXmlNonPrintingChar))] + [XmlInclude(typeof(PageXmlGrapheme))] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public abstract class PageXmlGraphemeBase { @@ -42,7 +42,7 @@ private string commentsField; /// - [XmlElementAttribute("TextEquiv")] + [XmlElement("TextEquiv")] public PageXmlTextEquiv[] TextEquivs { get @@ -56,7 +56,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -73,7 +73,7 @@ /// Order index of grapheme, group, or non-printing character /// within the parent container (graphemes or glyph or grapheme group). /// - [XmlAttributeAttribute("index")] + [XmlAttribute("index")] public int Index { get @@ -87,7 +87,7 @@ } /// - [XmlAttributeAttribute("ligature")] + [XmlAttribute("ligature")] public bool Ligature { get @@ -102,7 +102,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool LigatureSpecified { get @@ -118,7 +118,7 @@ /// /// Type of character represented by the grapheme, group, or non-printing character element. /// - [XmlAttributeAttribute("charType")] + [XmlAttribute("charType")] public PageXmlGraphemeBaseCharType CharType { get @@ -133,7 +133,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool CharTypeSpecified { get @@ -149,7 +149,7 @@ /// /// For generic use /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -165,7 +165,7 @@ /// /// For generic use /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphemeBaseCharType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphemeBaseCharType.cs similarity index 56% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphemeBaseCharType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphemeBaseCharType.cs index 0f5a8e1d..a3806717 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphemeBaseCharType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphemeBaseCharType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,18 +9,18 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(AnonymousType = true, Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(AnonymousType = true, Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlGraphemeBaseCharType { /// - [XmlEnumAttribute("base")] + [XmlEnum("base")] Base, /// - [XmlEnumAttribute("combining")] + [XmlEnum("combining")] Combining, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphemeGroup.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphemeGroup.cs similarity index 61% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphemeGroup.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphemeGroup.cs index da85e600..9ac31e91 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphemeGroup.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphemeGroup.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,19 +10,19 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlGraphemeGroup : PageXmlGraphemeBase { private PageXmlGraphemeBase[] itemsField; /// - [XmlElementAttribute("Grapheme", typeof(PageXmlGrapheme))] - [XmlElementAttribute("NonPrintingChar", typeof(PageXmlNonPrintingChar))] + [XmlElement("Grapheme", typeof(PageXmlGrapheme))] + [XmlElement("NonPrintingChar", typeof(PageXmlNonPrintingChar))] public PageXmlGraphemeBase[] Items { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphicRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphicRegion.cs similarity index 86% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphicRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphicRegion.cs index 9fa76e33..95a1ddc6 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphicRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphicRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -13,11 +13,11 @@ /// logo, should be marked as graphic regions. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlGraphicRegion : PageXmlRegion { #region private @@ -45,7 +45,7 @@ /// (negative values indicate anti-clockwise rotation). /// Range: -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -60,7 +60,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -76,7 +76,7 @@ /// /// The type of graphic in the region /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlGraphicsSimpleType Type { get @@ -91,7 +91,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -107,7 +107,7 @@ /// /// An approximation of the number of colours used in the region /// - [XmlAttributeAttribute("numColours")] + [XmlAttribute("numColours")] public int NumColours { get @@ -122,7 +122,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool NumColoursSpecified { get @@ -138,7 +138,7 @@ /// /// Specifies whether the region also contains text. /// - [XmlAttributeAttribute("embText")] + [XmlAttribute("embText")] public bool EmbText { get @@ -153,7 +153,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool EmbTextSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphicsSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphicsSimpleType.cs similarity index 55% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphicsSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphicsSimpleType.cs index 4ff7b9c3..2f3a99f0 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGraphicsSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGraphicsSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,54 +9,54 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlGraphicsSimpleType { /// - [XmlEnumAttribute("logo")] + [XmlEnum("logo")] Logo, /// - [XmlEnumAttribute("letterhead")] + [XmlEnum("letterhead")] Letterhead, /// - [XmlEnumAttribute("decoration")] + [XmlEnum("decoration")] Decoration, /// - [XmlEnumAttribute("frame")] + [XmlEnum("frame")] Frame, /// - [XmlEnumAttribute("handwritten-annotation")] + [XmlEnum("handwritten-annotation")] HandwrittenAnnotation, /// - [XmlEnumAttribute("stamp")] + [XmlEnum("stamp")] Stamp, /// - [XmlEnumAttribute("signature")] + [XmlEnum("signature")] Signature, /// - [XmlEnumAttribute("barcode")] + [XmlEnum("barcode")] Barcode, /// - [XmlEnumAttribute("paper-grow")] + [XmlEnum("paper-grow")] PaperGrow, /// - [XmlEnumAttribute("punch-hole")] + [XmlEnum("punch-hole")] PunchHole, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGridPoints.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGridPoints.cs similarity index 73% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGridPoints.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGridPoints.cs index add09659..93b35c93 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGridPoints.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGridPoints.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Points with x,y coordinates. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlGridPoints { @@ -27,7 +27,7 @@ /// /// The grid row index /// - [XmlAttributeAttribute("index")] + [XmlAttribute("index")] public int Index { get @@ -41,7 +41,7 @@ } /// - [XmlAttributeAttribute("points")] + [XmlAttribute("points")] public string Points { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGroupSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGroupSimpleType.cs similarity index 56% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGroupSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGroupSimpleType.cs index 80aea761..97a8bb63 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlGroupSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlGroupSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,38 +9,38 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlGroupSimpleType { /// - [XmlEnumAttribute("paragraph")] + [XmlEnum("paragraph")] Paragraph, /// - [XmlEnumAttribute("list")] + [XmlEnum("list")] List, /// - [XmlEnumAttribute("list-item")] + [XmlEnum("list-item")] ListItem, /// - [XmlEnumAttribute("figure")] + [XmlEnum("figure")] Figure, /// - [XmlEnumAttribute("article")] + [XmlEnum("article")] Article, /// - [XmlEnumAttribute("div")] + [XmlEnum("div")] Div, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlImageRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlImageRegion.cs similarity index 86% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlImageRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlImageRegion.cs index 80ea2383..98024d9d 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlImageRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlImageRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// An image is considered to be more intricate and complex than a graphic. These can be photos or drawings. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlImageRegion : PageXmlRegion { #region private @@ -44,7 +44,7 @@ /// (negative values indicate anti-clockwise rotation). /// Range: -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -59,7 +59,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -75,7 +75,7 @@ /// /// The colour bit depth required for the region /// - [XmlAttributeAttribute("colourDepth")] + [XmlAttribute("colourDepth")] public PageXmlColourDepthSimpleType ColourDepth { get @@ -90,7 +90,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ColourDepthSpecified { get @@ -106,7 +106,7 @@ /// /// The background colour of the region /// - [XmlAttributeAttribute("bgColour")] + [XmlAttribute("bgColour")] public PageXmlColourSimpleType BgColour { get @@ -121,7 +121,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool BgColourSpecified { get @@ -137,7 +137,7 @@ /// /// Specifies whether the region also contains text /// - [XmlAttributeAttribute("embText")] + [XmlAttribute("embText")] public bool EmbText { get @@ -152,7 +152,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool EmbTextSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLabel.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLabel.cs similarity index 78% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLabel.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLabel.cs index 4b32f6fb..6f65f386 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLabel.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLabel.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Semantic label /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlLabel { @@ -29,7 +29,7 @@ /// /// The label / tag (e.g. 'person'). Can be an RDF resource identifier (e.g. object of an RDF triple). /// - [XmlAttributeAttribute("value")] + [XmlAttribute("value")] public string Value { get @@ -45,7 +45,7 @@ /// /// Additional information on the label (e.g. 'YYYY-mm-dd' for a date label). Can be used as predicate of an RDF triple. /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public string Type { get @@ -59,7 +59,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLabels.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLabels.cs similarity index 81% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLabels.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLabels.cs index 93c63b09..096ac11e 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLabels.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLabels.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlLabels { @@ -31,7 +31,7 @@ /// /// A semantic label / tag /// - [XmlElementAttribute("Label")] + [XmlElement("Label")] public PageXmlLabel[] Labels { get @@ -47,7 +47,7 @@ /// /// Reference to external model / ontology / schema /// - [XmlAttributeAttribute("externalModel")] + [XmlAttribute("externalModel")] public string ExternalModel { get @@ -63,7 +63,7 @@ /// /// E.g. an RDF resource identifier (to be used as subject or object of an RDF triple) /// - [XmlAttributeAttribute("externalId")] + [XmlAttribute("externalId")] public string ExternalId { get @@ -79,7 +79,7 @@ /// /// Prefix for all labels (e.g. first part of an URI) /// - [XmlAttributeAttribute("prefix")] + [XmlAttribute("prefix")] public string Prefix { get @@ -93,7 +93,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLanguageSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLanguageSimpleType.cs similarity index 92% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLanguageSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLanguageSimpleType.cs index 9b9ee8b5..c30bfd1d 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLanguageSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLanguageSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -11,9 +11,9 @@ /// ISO 639.x 2016-07-14 /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlLanguageSimpleType { @@ -210,7 +210,7 @@ Hindi, /// - [XmlEnumAttribute("Hiri Motu")] + [XmlEnum("Hiri Motu")] HiriMotu, /// @@ -316,7 +316,7 @@ Lithuanian, /// - [XmlEnumAttribute("Luba-Katanga")] + [XmlEnum("Luba-Katanga")] LubaKatanga, /// @@ -365,22 +365,22 @@ Nepali, /// - [XmlEnumAttribute("North Ndebele")] + [XmlEnum("North Ndebele")] NorthNdebele, /// - [XmlEnumAttribute("Northern Sami")] + [XmlEnum("Northern Sami")] NorthernSami, /// Norwegian, /// - [XmlEnumAttribute("Norwegian Bokmål")] + [XmlEnum("Norwegian Bokmål")] NorwegianBokmål, /// - [XmlEnumAttribute("Norwegian Nynorsk")] + [XmlEnum("Norwegian Nynorsk")] NorwegianNynorsk, /// @@ -393,7 +393,7 @@ Ojibwe, /// - [XmlEnumAttribute("Old Church Slavonic")] + [XmlEnum("Old Church Slavonic")] OldChurchSlavonic, /// @@ -472,11 +472,11 @@ Somali, /// - [XmlEnumAttribute("South Ndebele")] + [XmlEnum("South Ndebele")] SouthNdebele, /// - [XmlEnumAttribute("Southern Sotho")] + [XmlEnum("Southern Sotho")] SouthernSotho, /// @@ -567,7 +567,7 @@ Welsh, /// - [XmlEnumAttribute("Western Frisian")] + [XmlEnum("Western Frisian")] WesternFrisian, /// @@ -589,7 +589,7 @@ Zulu, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLayer.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLayer.cs similarity index 76% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLayer.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLayer.cs index 381a37b5..181a50f7 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLayer.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLayer.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlLayer { @@ -27,7 +27,7 @@ private string captionField; /// - [XmlElementAttribute("RegionRef")] + [XmlElement("RegionRef")] public PageXmlRegionRef[] RegionRefs { get @@ -41,7 +41,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -55,7 +55,7 @@ } /// - [XmlAttributeAttribute("zIndex")] + [XmlAttribute("zIndex")] public int ZIndex { get @@ -69,7 +69,7 @@ } /// - [XmlAttributeAttribute("caption")] + [XmlAttribute("caption")] public string Caption { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLayers.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLayers.cs similarity index 71% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLayers.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLayers.cs index 5c5eea79..c20c6789 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLayers.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLayers.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -14,18 +14,18 @@ /// front of another element with lower z-index. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlLayers { private PageXmlLayer[] layerField; /// - [XmlElementAttribute("Layer")] + [XmlElement("Layer")] public PageXmlLayer[] Layers { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLineDrawingRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLineDrawingRegion.cs similarity index 86% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLineDrawingRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLineDrawingRegion.cs index 4d4a910b..fbadba88 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlLineDrawingRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlLineDrawingRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// A line drawing is a single colour illustration without solid areas. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlLineDrawingRegion : PageXmlRegion { #region private @@ -44,7 +44,7 @@ /// (negative values indicate anti-clockwise rotation). /// Range: -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -59,7 +59,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -75,7 +75,7 @@ /// /// The pen (foreground) colour of the region /// - [XmlAttributeAttribute("penColour")] + [XmlAttribute("penColour")] public PageXmlColourSimpleType PenColour { get @@ -90,7 +90,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool PenColourSpecified { get @@ -106,7 +106,7 @@ /// /// The background colour of the region /// - [XmlAttributeAttribute("bgColour")] + [XmlAttribute("bgColour")] public PageXmlColourSimpleType BgColour { get @@ -121,7 +121,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool BgColourSpecified { get @@ -137,7 +137,7 @@ /// /// Specifies whether the region also contains text /// - [XmlAttributeAttribute("embText")] + [XmlAttribute("embText")] public bool EmbText { get @@ -152,7 +152,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool EmbTextSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMapRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMapRegion.cs similarity index 79% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMapRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMapRegion.cs index be805904..3db5de0d 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMapRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMapRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Regions containing maps. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlMapRegion : PageXmlRegion { @@ -32,7 +32,7 @@ /// anti-clockwise rotation). Range: /// -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -47,7 +47,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMathsRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMathsRegion.cs similarity index 83% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMathsRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMathsRegion.cs index 466b3891..7c8d750f 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMathsRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMathsRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Regions containing equations and mathematical symbols should be marked as maths regions. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlMathsRegion : PageXmlRegion { @@ -35,7 +35,7 @@ /// (negative values indicate anti-clockwise rotation). /// Range: -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -50,7 +50,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -66,7 +66,7 @@ /// /// The background colour of the region /// - [XmlAttributeAttribute("bgColour")] + [XmlAttribute("bgColour")] public PageXmlColourSimpleType BgColour { get @@ -81,7 +81,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool BgColourSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMetadata.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMetadata.cs similarity index 86% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMetadata.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMetadata.cs index 7adc31e5..d108cccd 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMetadata.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMetadata.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlMetadata { @@ -89,7 +89,7 @@ } /// - [XmlArrayItemAttribute("UserAttribute", IsNullable = false)] + [XmlArrayItem("UserAttribute", IsNullable = false)] public PageXmlUserAttribute[] UserDefined { get @@ -105,7 +105,7 @@ /// /// /// - [XmlElementAttribute("MetadataItem")] + [XmlElement("MetadataItem")] public PageXmlMetadataItem[] MetadataItems { get @@ -121,7 +121,7 @@ /// /// External reference of any kind /// - [XmlAttributeAttribute("externalRef")] + [XmlAttribute("externalRef")] public string ExternalRef { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMetadataItem.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMetadataItem.cs similarity index 83% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMetadataItem.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMetadataItem.cs index d6e8c1ac..ae79dea2 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMetadataItem.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMetadataItem.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlMetadataItem { @@ -35,7 +35,7 @@ /// /// Semantic labels / tags /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -51,7 +51,7 @@ /// /// Type of metadata (e.g. author) /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlMetadataItemType Type { get @@ -66,7 +66,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -82,7 +82,7 @@ /// /// E.g. imagePhotometricInterpretation /// - [XmlAttributeAttribute("name")] + [XmlAttribute("name")] public string Name { get @@ -98,7 +98,7 @@ /// /// E.g. RGB /// - [XmlAttributeAttribute("value")] + [XmlAttribute("value")] public string Value { get @@ -112,7 +112,7 @@ } /// - [XmlAttributeAttribute("date")] + [XmlAttribute("date")] public DateTime Date { get @@ -127,7 +127,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool DateSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMetadataItemType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMetadataItemType.cs similarity index 55% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMetadataItemType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMetadataItemType.cs index 70ab5152..94656568 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMetadataItemType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMetadataItemType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,26 +9,26 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(AnonymousType = true, Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(AnonymousType = true, Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlMetadataItemType { /// - [XmlEnumAttribute("author")] + [XmlEnum("author")] Author, /// - [XmlEnumAttribute("imageProperties")] + [XmlEnum("imageProperties")] ImageProperties, /// - [XmlEnumAttribute("processingStep")] + [XmlEnum("processingStep")] ProcessingStep, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMusicRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMusicRegion.cs similarity index 83% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMusicRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMusicRegion.cs index 33eb722e..92d4e13b 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlMusicRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlMusicRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Regions containing musical notations. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlMusicRegion : PageXmlRegion { @@ -35,7 +35,7 @@ /// (negative values indicate anti-clockwise rotation). /// Range: -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -50,7 +50,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -66,7 +66,7 @@ /// /// The background colour of the region /// - [XmlAttributeAttribute("bgColour")] + [XmlAttribute("bgColour")] public PageXmlColourSimpleType BgColour { get @@ -81,7 +81,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool BgColourSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlNoiseRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlNoiseRegion.cs similarity index 63% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlNoiseRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlNoiseRegion.cs index 9c19b03e..d93fa716 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlNoiseRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlNoiseRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -14,11 +14,11 @@ /// scanner noise. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlNoiseRegion : PageXmlRegion { } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlNonPrintingChar.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlNonPrintingChar.cs similarity index 67% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlNonPrintingChar.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlNonPrintingChar.cs index b0c8d8f4..c821efc9 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlNonPrintingChar.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlNonPrintingChar.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -15,11 +15,11 @@ /// Part of grapheme container (of glyph) or grapheme sub group. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlNonPrintingChar : PageXmlGraphemeBase { } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlOrderedGroup.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlOrderedGroup.cs similarity index 82% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlOrderedGroup.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlOrderedGroup.cs index cd6df9eb..1285d813 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlOrderedGroup.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlOrderedGroup.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Numbered group (contains ordered elements) /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlOrderedGroup { #region private @@ -46,7 +46,7 @@ #endregion /// - [XmlArrayItemAttribute("UserAttribute", IsNullable = false)] + [XmlArrayItem("UserAttribute", IsNullable = false)] public PageXmlUserAttribute[] UserDefined { get @@ -62,7 +62,7 @@ /// /// Semantic labels / tags /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -76,9 +76,9 @@ } /// - [XmlElementAttribute("OrderedGroupIndexed", typeof(PageXmlOrderedGroupIndexed))] - [XmlElementAttribute("RegionRefIndexed", typeof(PageXmlRegionRefIndexed))] - [XmlElementAttribute("UnorderedGroupIndexed", typeof(PageXmlUnorderedGroupIndexed))] + [XmlElement("OrderedGroupIndexed", typeof(PageXmlOrderedGroupIndexed))] + [XmlElement("RegionRefIndexed", typeof(PageXmlRegionRefIndexed))] + [XmlElement("UnorderedGroupIndexed", typeof(PageXmlUnorderedGroupIndexed))] public object[] Items { get @@ -92,7 +92,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -110,7 +110,7 @@ /// The parent region doubles as reading order group. /// Only the nested regions should be allowed as group members. /// - [XmlAttributeAttribute("regionRef", DataType = "IDREF")] + [XmlAttribute("regionRef", DataType = "IDREF")] public string regionRef { get @@ -124,7 +124,7 @@ } /// - [XmlAttributeAttribute("caption")] + [XmlAttribute("caption")] public string Caption { get @@ -138,7 +138,7 @@ } /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlGroupSimpleType Type { get @@ -153,7 +153,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -170,7 +170,7 @@ /// Is this group a continuation of another group /// (from previous column or page, for example)? /// - [XmlAttributeAttribute("continuation")] + [XmlAttribute("continuation")] public bool Continuation { get @@ -185,7 +185,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ContinuationSpecified { get @@ -201,7 +201,7 @@ /// /// For generic use /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -215,7 +215,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlOrderedGroupIndexed.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlOrderedGroupIndexed.cs similarity index 80% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlOrderedGroupIndexed.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlOrderedGroupIndexed.cs index 1258584b..612faf3e 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlOrderedGroupIndexed.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlOrderedGroupIndexed.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlOrderedGroupIndexed { @@ -45,7 +45,7 @@ private string commentsField; /// - [XmlArrayItemAttribute("UserAttribute", IsNullable = false)] + [XmlArrayItem("UserAttribute", IsNullable = false)] public PageXmlUserAttribute[] UserDefined { get @@ -59,7 +59,7 @@ } /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -73,9 +73,9 @@ } /// - [XmlElementAttribute("OrderedGroupIndexed", typeof(PageXmlOrderedGroupIndexed))] - [XmlElementAttribute("RegionRefIndexed", typeof(PageXmlRegionRefIndexed))] - [XmlElementAttribute("UnorderedGroupIndexed", typeof(PageXmlUnorderedGroupIndexed))] + [XmlElement("OrderedGroupIndexed", typeof(PageXmlOrderedGroupIndexed))] + [XmlElement("RegionRefIndexed", typeof(PageXmlRegionRefIndexed))] + [XmlElement("UnorderedGroupIndexed", typeof(PageXmlUnorderedGroupIndexed))] public object[] Items { get @@ -89,7 +89,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -103,7 +103,7 @@ } /// - [XmlAttributeAttribute("regionRef", DataType = "IDREF")] + [XmlAttribute("regionRef", DataType = "IDREF")] public string RegionRef { get @@ -117,7 +117,7 @@ } /// - [XmlAttributeAttribute("index")] + [XmlAttribute("index")] public int Index { get @@ -131,7 +131,7 @@ } /// - [XmlAttributeAttribute("caption")] + [XmlAttribute("caption")] public string Caption { get @@ -145,7 +145,7 @@ } /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlGroupSimpleType Type { get @@ -160,7 +160,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -174,7 +174,7 @@ } /// - [XmlAttributeAttribute("continuation")] + [XmlAttribute("continuation")] public bool Continuation { get @@ -189,7 +189,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ContinuationSpecified { get @@ -203,7 +203,7 @@ } /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -217,7 +217,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPage.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPage.cs similarity index 86% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPage.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPage.cs index fedd0b4e..29cc8378 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPage.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPage.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlPage { @@ -97,7 +97,7 @@ /// /// Alternative document page images (e.g.black-and-white). /// - [XmlElementAttribute("AlternativeImage")] + [XmlElement("AlternativeImage")] public PageXmlAlternativeImage[] AlternativeImage { get @@ -195,7 +195,7 @@ } /// - [XmlArrayItemAttribute("UserAttribute", IsNullable = false)] + [XmlArrayItem("UserAttribute", IsNullable = false)] public PageXmlUserAttribute[] UserDefined { get @@ -211,7 +211,7 @@ /// /// Semantic labels / tags /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -225,21 +225,21 @@ } /// - [XmlElementAttribute("AdvertRegion", typeof(PageXmlAdvertRegion))] - [XmlElementAttribute("ChartRegion", typeof(PageXmlChartRegion))] - [XmlElementAttribute("ChemRegion", typeof(PageXmlChemRegion))] - [XmlElementAttribute("CustomRegion", typeof(PageXmlCustomRegion))] - [XmlElementAttribute("GraphicRegion", typeof(PageXmlGraphicRegion))] - [XmlElementAttribute("ImageRegion", typeof(PageXmlImageRegion))] - [XmlElementAttribute("LineDrawingRegion", typeof(PageXmlLineDrawingRegion))] - [XmlElementAttribute("MapRegion", typeof(PageXmlMapRegion))] - [XmlElementAttribute("MathsRegion", typeof(PageXmlMathsRegion))] - [XmlElementAttribute("MusicRegion", typeof(PageXmlMusicRegion))] - [XmlElementAttribute("NoiseRegion", typeof(PageXmlNoiseRegion))] - [XmlElementAttribute("SeparatorRegion", typeof(PageXmlSeparatorRegion))] - [XmlElementAttribute("TableRegion", typeof(PageXmlTableRegion))] - [XmlElementAttribute("TextRegion", typeof(PageXmlTextRegion))] - [XmlElementAttribute("UnknownRegion", typeof(PageXmlUnknownRegion))] + [XmlElement("AdvertRegion", typeof(PageXmlAdvertRegion))] + [XmlElement("ChartRegion", typeof(PageXmlChartRegion))] + [XmlElement("ChemRegion", typeof(PageXmlChemRegion))] + [XmlElement("CustomRegion", typeof(PageXmlCustomRegion))] + [XmlElement("GraphicRegion", typeof(PageXmlGraphicRegion))] + [XmlElement("ImageRegion", typeof(PageXmlImageRegion))] + [XmlElement("LineDrawingRegion", typeof(PageXmlLineDrawingRegion))] + [XmlElement("MapRegion", typeof(PageXmlMapRegion))] + [XmlElement("MathsRegion", typeof(PageXmlMathsRegion))] + [XmlElement("MusicRegion", typeof(PageXmlMusicRegion))] + [XmlElement("NoiseRegion", typeof(PageXmlNoiseRegion))] + [XmlElement("SeparatorRegion", typeof(PageXmlSeparatorRegion))] + [XmlElement("TableRegion", typeof(PageXmlTableRegion))] + [XmlElement("TextRegion", typeof(PageXmlTextRegion))] + [XmlElement("UnknownRegion", typeof(PageXmlUnknownRegion))] public PageXmlRegion[] Items { get @@ -255,7 +255,7 @@ /// /// Contains the image file name including the file extension. /// - [XmlAttributeAttribute("imageFilename")] + [XmlAttribute("imageFilename")] public string ImageFilename { get @@ -271,7 +271,7 @@ /// /// Specifies the width of the image. /// - [XmlAttributeAttribute("imageWidth")] + [XmlAttribute("imageWidth")] public int ImageWidth { get @@ -287,7 +287,7 @@ /// /// Specifies the height of the image. /// - [XmlAttributeAttribute("imageHeight")] + [XmlAttribute("imageHeight")] public int ImageHeight { get @@ -303,7 +303,7 @@ /// /// Specifies the image resolution in width. /// - [XmlAttributeAttribute("imageXResolution")] + [XmlAttribute("imageXResolution")] public float ImageXResolution { get @@ -318,7 +318,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ImageXResolutionSpecified { get @@ -334,7 +334,7 @@ /// /// Specifies the image resolution in height. /// - [XmlAttributeAttribute("imageYResolution")] + [XmlAttribute("imageYResolution")] public float ImageYResolution { get @@ -349,7 +349,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ImageYResolutionSpecified { get @@ -366,7 +366,7 @@ /// Specifies the unit of the resolution information referring to a standardised unit of measurement /// (pixels per inch, pixels per centimeter or other). /// - [XmlAttributeAttribute("imageResolutionUnit")] + [XmlAttribute("imageResolutionUnit")] public PageXmlPageImageResolutionUnit ImageResolutionUnit { get @@ -381,7 +381,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ImageResolutionUnitSpecified { get @@ -397,7 +397,7 @@ /// /// For generic use /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -416,7 +416,7 @@ /// (The rotated image can be further referenced via “AlternativeImage”.) /// Range: -179.999, 180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -431,7 +431,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -448,7 +448,7 @@ /// The type of the page within the document /// (e.g.cover page). /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlPageSimpleType Type { get @@ -463,7 +463,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -479,7 +479,7 @@ /// /// The primary language used in the page (lower-level definitions override the page-level definition). /// - [XmlAttributeAttribute("primaryLanguage")] + [XmlAttribute("primaryLanguage")] public PageXmlLanguageSimpleType PrimaryLanguage { get @@ -494,7 +494,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool PrimaryLanguageSpecified { get @@ -510,7 +510,7 @@ /// /// The secondary language used in the page (lower-level definitions override the page-level definition). /// - [XmlAttributeAttribute("secondaryLanguage")] + [XmlAttribute("secondaryLanguage")] public PageXmlLanguageSimpleType SecondaryLanguage { get @@ -525,7 +525,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SecondaryLanguageSpecified { get @@ -541,7 +541,7 @@ /// /// The primary script used in the page (lower-level definitions override the page-level definition). /// - [XmlAttributeAttribute("primaryScript")] + [XmlAttribute("primaryScript")] public PageXmlScriptSimpleType PrimaryScript { get @@ -556,7 +556,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool PrimaryScriptSpecified { get @@ -572,7 +572,7 @@ /// /// The secondary script used in the page (lower-level definitions override the page-level definition). /// - [XmlAttributeAttribute("secondaryScript")] + [XmlAttribute("secondaryScript")] public PageXmlScriptSimpleType SecondaryScript { get @@ -587,7 +587,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SecondaryScriptSpecified { get @@ -604,7 +604,7 @@ /// The direction in which text within lines should be read(order of words and characters), /// in addition to “textLineOrder” (lower-level definitions override the page-level definition). /// - [XmlAttributeAttribute("readingDirection")] + [XmlAttribute("readingDirection")] public PageXmlReadingDirectionSimpleType ReadingDirection { get @@ -619,7 +619,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ReadingDirectionSpecified { get @@ -636,7 +636,7 @@ /// The order of text lines within a block, in addition to “readingDirection” /// (lower-level definitions override the page-level definition). /// - [XmlAttributeAttribute("textLineOrder")] + [XmlAttribute("textLineOrder")] public PageXmlTextLineOrderSimpleType TextLineOrder { get @@ -651,7 +651,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TextLineOrderSpecified { get @@ -667,7 +667,7 @@ /// /// Confidence value for whole page (between 0 and 1) /// - [XmlAttributeAttribute("conf")] + [XmlAttribute("conf")] public float Conf { get @@ -682,7 +682,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ConfSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPageImageResolutionUnit.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPageImageResolutionUnit.cs similarity index 69% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPageImageResolutionUnit.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPageImageResolutionUnit.cs index ec1034f9..0293758d 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPageImageResolutionUnit.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPageImageResolutionUnit.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -11,9 +11,9 @@ /// Specifies the unit of the resolution information referring to a standardised unit of measurement (pixels per inch, pixels per centimeter or other). /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(AnonymousType = true, Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(AnonymousType = true, Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlPageImageResolutionUnit { @@ -24,7 +24,7 @@ PPCM, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPageSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPageSimpleType.cs similarity index 55% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPageSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPageSimpleType.cs index dbacf530..88f6d9d4 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPageSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPageSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,42 +9,42 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlPageSimpleType { /// - [XmlEnumAttribute("front-cover")] + [XmlEnum("front-cover")] FrontCover, /// - [XmlEnumAttribute("back-cover")] + [XmlEnum("back-cover")] BackCover, /// - [XmlEnumAttribute("title")] + [XmlEnum("title")] Title, /// - [XmlEnumAttribute("table-of-contents")] + [XmlEnum("table-of-contents")] TableOfContents, /// - [XmlEnumAttribute("index")] + [XmlEnum("index")] Index, /// - [XmlEnumAttribute("content")] + [XmlEnum("content")] Content, /// - [XmlEnumAttribute("blank")] + [XmlEnum("blank")] Blank, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPrintSpace.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPrintSpace.cs similarity index 78% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPrintSpace.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPrintSpace.cs index fedd126e..f04547bd 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlPrintSpace.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlPrintSpace.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -18,11 +18,11 @@ /// marginals, signature mark, preview words. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlPrintSpace { diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlProductionSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlProductionSimpleType.cs similarity index 58% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlProductionSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlProductionSimpleType.cs index 2b510393..9ef5fdc1 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlProductionSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlProductionSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -11,34 +11,34 @@ /// Text production type /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlProductionSimpleType { /// - [XmlEnumAttribute("printed")] + [XmlEnum("printed")] Printed, /// - [XmlEnumAttribute("typewritten")] + [XmlEnum("typewritten")] Typewritten, /// - [XmlEnumAttribute("handwritten-cursive")] + [XmlEnum("handwritten-cursive")] HandwrittenCursive, /// - [XmlEnumAttribute("handwritten-printscript")] + [XmlEnum("handwritten-printscript")] HandwrittenPrintscript, /// - [XmlEnumAttribute("medieval-manuscript")] + [XmlEnum("medieval-manuscript")] MedievalManuscript, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlReadingDirectionSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlReadingDirectionSimpleType.cs similarity index 56% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlReadingDirectionSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlReadingDirectionSimpleType.cs index b50bf15c..e63d1d00 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlReadingDirectionSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlReadingDirectionSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,26 +9,26 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlReadingDirectionSimpleType { /// - [XmlEnumAttribute("left-to-right")] + [XmlEnum("left-to-right")] LeftToRight, /// - [XmlEnumAttribute("right-to-left")] + [XmlEnum("right-to-left")] RightToLeft, /// - [XmlEnumAttribute("top-to-bottom")] + [XmlEnum("top-to-bottom")] TopToBottom, /// - [XmlEnumAttribute("bottom-to-top")] + [XmlEnum("bottom-to-top")] BottomToTop, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlReadingOrder.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlReadingOrder.cs similarity index 72% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlReadingOrder.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlReadingOrder.cs index b609bc16..3e17f89f 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlReadingOrder.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlReadingOrder.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlReadingOrder { @@ -25,8 +25,8 @@ private bool confFieldSpecified; /// - [XmlElementAttribute("OrderedGroup", typeof(PageXmlOrderedGroup))] - [XmlElementAttribute("UnorderedGroup", typeof(PageXmlUnorderedGroup))] + [XmlElement("OrderedGroup", typeof(PageXmlOrderedGroup))] + [XmlElement("UnorderedGroup", typeof(PageXmlUnorderedGroup))] public object Item { get @@ -42,7 +42,7 @@ /// /// Confidence value (between 0 and 1) /// - [XmlAttributeAttribute("conf")] + [XmlAttribute("conf")] public float Conf { get @@ -57,7 +57,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ConfSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRegion.cs similarity index 64% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRegion.cs index 27e198a8..a433f7c6 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,26 +10,26 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [XmlIncludeAttribute(typeof(PageXmlMapRegion))] - [XmlIncludeAttribute(typeof(PageXmlCustomRegion))] - [XmlIncludeAttribute(typeof(PageXmlUnknownRegion))] - [XmlIncludeAttribute(typeof(PageXmlNoiseRegion))] - [XmlIncludeAttribute(typeof(PageXmlAdvertRegion))] - [XmlIncludeAttribute(typeof(PageXmlMusicRegion))] - [XmlIncludeAttribute(typeof(PageXmlChemRegion))] - [XmlIncludeAttribute(typeof(PageXmlMathsRegion))] - [XmlIncludeAttribute(typeof(PageXmlSeparatorRegion))] - [XmlIncludeAttribute(typeof(PageXmlChartRegion))] - [XmlIncludeAttribute(typeof(PageXmlTableRegion))] - [XmlIncludeAttribute(typeof(PageXmlGraphicRegion))] - [XmlIncludeAttribute(typeof(PageXmlLineDrawingRegion))] - [XmlIncludeAttribute(typeof(PageXmlImageRegion))] - [XmlIncludeAttribute(typeof(PageXmlTextRegion))] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [XmlInclude(typeof(PageXmlMapRegion))] + [XmlInclude(typeof(PageXmlCustomRegion))] + [XmlInclude(typeof(PageXmlUnknownRegion))] + [XmlInclude(typeof(PageXmlNoiseRegion))] + [XmlInclude(typeof(PageXmlAdvertRegion))] + [XmlInclude(typeof(PageXmlMusicRegion))] + [XmlInclude(typeof(PageXmlChemRegion))] + [XmlInclude(typeof(PageXmlMathsRegion))] + [XmlInclude(typeof(PageXmlSeparatorRegion))] + [XmlInclude(typeof(PageXmlChartRegion))] + [XmlInclude(typeof(PageXmlTableRegion))] + [XmlInclude(typeof(PageXmlGraphicRegion))] + [XmlInclude(typeof(PageXmlLineDrawingRegion))] + [XmlInclude(typeof(PageXmlImageRegion))] + [XmlInclude(typeof(PageXmlTextRegion))] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public abstract class PageXmlRegion { #region private @@ -59,7 +59,7 @@ /// /// Alternative region images (e.g.black-and-white). /// - [XmlElementAttribute("AlternativeImage")] + [XmlElement("AlternativeImage")] public PageXmlAlternativeImage[] AlternativeImage { get @@ -86,7 +86,7 @@ } /// - [XmlArrayItemAttribute("UserAttribute", IsNullable = false)] + [XmlArrayItem("UserAttribute", IsNullable = false)] public PageXmlUserAttribute[] UserDefined { get @@ -102,7 +102,7 @@ /// /// Semantic labels / tags /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -131,20 +131,20 @@ } /// - [XmlElementAttribute("AdvertRegion", typeof(PageXmlAdvertRegion))] - [XmlElementAttribute("ChartRegion", typeof(PageXmlChartRegion))] - [XmlElementAttribute("ChemRegion", typeof(PageXmlChemRegion))] - [XmlElementAttribute("CustomRegion", typeof(PageXmlCustomRegion))] - [XmlElementAttribute("GraphicRegion", typeof(PageXmlGraphicRegion))] - [XmlElementAttribute("ImageRegion", typeof(PageXmlImageRegion))] - [XmlElementAttribute("LineDrawingRegion", typeof(PageXmlLineDrawingRegion))] - [XmlElementAttribute("MathsRegion", typeof(PageXmlMathsRegion))] - [XmlElementAttribute("MusicRegion", typeof(PageXmlMusicRegion))] - [XmlElementAttribute("NoiseRegion", typeof(PageXmlNoiseRegion))] - [XmlElementAttribute("SeparatorRegion", typeof(PageXmlSeparatorRegion))] - [XmlElementAttribute("TableRegion", typeof(PageXmlTableRegion))] - [XmlElementAttribute("TextRegion", typeof(PageXmlTextRegion))] - [XmlElementAttribute("UnknownRegion", typeof(PageXmlUnknownRegion))] + [XmlElement("AdvertRegion", typeof(PageXmlAdvertRegion))] + [XmlElement("ChartRegion", typeof(PageXmlChartRegion))] + [XmlElement("ChemRegion", typeof(PageXmlChemRegion))] + [XmlElement("CustomRegion", typeof(PageXmlCustomRegion))] + [XmlElement("GraphicRegion", typeof(PageXmlGraphicRegion))] + [XmlElement("ImageRegion", typeof(PageXmlImageRegion))] + [XmlElement("LineDrawingRegion", typeof(PageXmlLineDrawingRegion))] + [XmlElement("MathsRegion", typeof(PageXmlMathsRegion))] + [XmlElement("MusicRegion", typeof(PageXmlMusicRegion))] + [XmlElement("NoiseRegion", typeof(PageXmlNoiseRegion))] + [XmlElement("SeparatorRegion", typeof(PageXmlSeparatorRegion))] + [XmlElement("TableRegion", typeof(PageXmlTableRegion))] + [XmlElement("TextRegion", typeof(PageXmlTextRegion))] + [XmlElement("UnknownRegion", typeof(PageXmlUnknownRegion))] public PageXmlRegion[] Items { get @@ -158,7 +158,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -175,7 +175,7 @@ /// /// For generic use /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -189,7 +189,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get @@ -206,7 +206,7 @@ /// Is this region a continuation of another region /// (in previous column or page, for example)? /// - [XmlAttributeAttribute("continuation")] + [XmlAttribute("continuation")] public bool Continuation { get @@ -221,7 +221,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ContinuationSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRegionRef.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRegionRef.cs similarity index 64% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRegionRef.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRegionRef.cs index cb3c90e2..edfb9e50 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRegionRef.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRegionRef.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,18 +10,18 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlRegionRef { private string regionRefField; /// - [XmlAttributeAttribute("regionRef", DataType = "IDREF")] + [XmlAttribute("regionRef", DataType = "IDREF")] public string RegionRef { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRegionRefIndexed.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRegionRefIndexed.cs similarity index 73% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRegionRefIndexed.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRegionRefIndexed.cs index a0e901d7..9d1701df 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRegionRefIndexed.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRegionRefIndexed.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Numbered region /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlRegionRefIndexed { @@ -27,7 +27,7 @@ /// /// Position (order number) of this item within the current hierarchy level. /// - [XmlAttributeAttribute("index")] + [XmlAttribute("index")] public int Index { get @@ -41,7 +41,7 @@ } /// - [XmlAttributeAttribute("regionRef", DataType = "IDREF")] + [XmlAttribute("regionRef", DataType = "IDREF")] public string RegionRef { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRelation.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRelation.cs similarity index 87% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRelation.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRelation.cs index 9a0f3cbd..396eef60 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRelation.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRelation.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -27,11 +27,11 @@ /// paragraph) /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlRelation { @@ -54,7 +54,7 @@ /// /// Semantic labels / tags /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -94,7 +94,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -108,7 +108,7 @@ } /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlRelationType Type { get @@ -123,7 +123,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -139,7 +139,7 @@ /// /// For generic use /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -153,7 +153,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRelationType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRelationType.cs similarity index 56% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRelationType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRelationType.cs index 934ba59d..28444756 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRelationType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRelationType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,18 +9,18 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(AnonymousType = true, Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(AnonymousType = true, Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlRelationType { /// - [XmlEnumAttribute("link")] + [XmlEnum("link")] Link, /// - [XmlEnumAttribute("join")] + [XmlEnum("join")] Join, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRelations.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRelations.cs similarity index 71% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRelations.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRelations.cs index 88f5bdcd..ce1ede25 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRelations.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRelations.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -14,18 +14,18 @@ /// image). /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlRelations { private PageXmlRelation[] relationField; /// - [XmlElementAttribute("Relation")] + [XmlElement("Relation")] public PageXmlRelation[] Relations { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRoles.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRoles.cs similarity index 73% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRoles.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRoles.cs index 49768d21..8b27c251 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlRoles.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlRoles.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlRoles { diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlScriptSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlScriptSimpleType.cs similarity index 51% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlScriptSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlScriptSimpleType.cs index 8f050d8a..af81b66a 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlScriptSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlScriptSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -11,734 +11,734 @@ /// iso15924 2016-07-14 /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlScriptSimpleType { /// - [XmlEnumAttribute("Adlm - Adlam")] + [XmlEnum("Adlm - Adlam")] AdlmAdlam, /// - [XmlEnumAttribute("Afak - Afaka")] + [XmlEnum("Afak - Afaka")] AfakAfaka, /// - [XmlEnumAttribute("Aghb - Caucasian Albanian")] + [XmlEnum("Aghb - Caucasian Albanian")] AghbCaucasianAlbanian, /// - [XmlEnumAttribute("Ahom - Ahom, Tai Ahom")] + [XmlEnum("Ahom - Ahom, Tai Ahom")] AhomAhomTaiAhom, /// - [XmlEnumAttribute("Arab - Arabic")] + [XmlEnum("Arab - Arabic")] ArabArabic, /// - [XmlEnumAttribute("Aran - Arabic (Nastaliq variant)")] + [XmlEnum("Aran - Arabic (Nastaliq variant)")] AranArabicNastaliqVariant, /// - [XmlEnumAttribute("Armi - Imperial Aramaic")] + [XmlEnum("Armi - Imperial Aramaic")] ArmiImperialAramaic, /// - [XmlEnumAttribute("Armn - Armenian")] + [XmlEnum("Armn - Armenian")] ArmnArmenian, /// - [XmlEnumAttribute("Avst - Avestan")] + [XmlEnum("Avst - Avestan")] AvstAvestan, /// - [XmlEnumAttribute("Bali - Balinese")] + [XmlEnum("Bali - Balinese")] BaliBalinese, /// - [XmlEnumAttribute("Bamu - Bamum")] + [XmlEnum("Bamu - Bamum")] BamuBamum, /// - [XmlEnumAttribute("Bass - Bassa Vah")] + [XmlEnum("Bass - Bassa Vah")] BassBassaVah, /// - [XmlEnumAttribute("Batk - Batak")] + [XmlEnum("Batk - Batak")] BatkBatak, /// - [XmlEnumAttribute("Beng - Bengali")] + [XmlEnum("Beng - Bengali")] BengBengali, /// - [XmlEnumAttribute("Bhks - Bhaiksuki")] + [XmlEnum("Bhks - Bhaiksuki")] BhksBhaiksuki, /// - [XmlEnumAttribute("Blis - Blissymbols")] + [XmlEnum("Blis - Blissymbols")] BlisBlissymbols, /// - [XmlEnumAttribute("Bopo - Bopomofo")] + [XmlEnum("Bopo - Bopomofo")] BopoBopomofo, /// - [XmlEnumAttribute("Brah - Brahmi")] + [XmlEnum("Brah - Brahmi")] BrahBrahmi, /// - [XmlEnumAttribute("Brai - Braille")] + [XmlEnum("Brai - Braille")] BraiBraille, /// - [XmlEnumAttribute("Bugi - Buginese")] + [XmlEnum("Bugi - Buginese")] BugiBuginese, /// - [XmlEnumAttribute("Buhd - Buhid")] + [XmlEnum("Buhd - Buhid")] BuhdBuhid, /// - [XmlEnumAttribute("Cakm - Chakma")] + [XmlEnum("Cakm - Chakma")] CakmChakma, /// - [XmlEnumAttribute("Cans - Unified Canadian Aboriginal Syllabics")] + [XmlEnum("Cans - Unified Canadian Aboriginal Syllabics")] CansUnifiedCanadianAboriginalSyllabics, /// - [XmlEnumAttribute("Cari - Carian")] + [XmlEnum("Cari - Carian")] CariCarian, /// - [XmlEnumAttribute("Cham - Cham")] + [XmlEnum("Cham - Cham")] ChamCham, /// - [XmlEnumAttribute("Cher - Cherokee")] + [XmlEnum("Cher - Cherokee")] CherCherokee, /// - [XmlEnumAttribute("Cirt - Cirth")] + [XmlEnum("Cirt - Cirth")] CirtCirth, /// - [XmlEnumAttribute("Copt - Coptic")] + [XmlEnum("Copt - Coptic")] CoptCoptic, /// - [XmlEnumAttribute("Cprt - Cypriot")] + [XmlEnum("Cprt - Cypriot")] CprtCypriot, /// - [XmlEnumAttribute("Cyrl - Cyrillic")] + [XmlEnum("Cyrl - Cyrillic")] CyrlCyrillic, /// - [XmlEnumAttribute("Cyrs - Cyrillic (Old Church Slavonic variant)")] + [XmlEnum("Cyrs - Cyrillic (Old Church Slavonic variant)")] CyrsCyrillicOldChurchSlavonicVariant, /// - [XmlEnumAttribute("Deva - Devanagari (Nagari)")] + [XmlEnum("Deva - Devanagari (Nagari)")] DevaDevanagariNagari, /// - [XmlEnumAttribute("Dsrt - Deseret (Mormon)")] + [XmlEnum("Dsrt - Deseret (Mormon)")] DsrtDeseretMormon, /// - [XmlEnumAttribute("Dupl - Duployan shorthand, Duployan stenography")] + [XmlEnum("Dupl - Duployan shorthand, Duployan stenography")] DuplDuployanShorthandDuployanStenography, /// - [XmlEnumAttribute("Egyd - Egyptian demotic")] + [XmlEnum("Egyd - Egyptian demotic")] EgydEgyptianDemotic, /// - [XmlEnumAttribute("Egyh - Egyptian hieratic")] + [XmlEnum("Egyh - Egyptian hieratic")] EgyhEgyptianHieratic, /// - [XmlEnumAttribute("Egyp - Egyptian hieroglyphs")] + [XmlEnum("Egyp - Egyptian hieroglyphs")] EgypEgyptianHieroglyphs, /// - [XmlEnumAttribute("Elba - Elbasan")] + [XmlEnum("Elba - Elbasan")] ElbaElbasan, /// - [XmlEnumAttribute("Ethi - Ethiopic")] + [XmlEnum("Ethi - Ethiopic")] EthiEthiopic, /// - [XmlEnumAttribute("Geok - Khutsuri (Asomtavruli and Nuskhuri)")] + [XmlEnum("Geok - Khutsuri (Asomtavruli and Nuskhuri)")] GeokKhutsuriAsomtavruliAndNuskhuri, /// - [XmlEnumAttribute("Geor - Georgian (Mkhedruli)")] + [XmlEnum("Geor - Georgian (Mkhedruli)")] GeorGeorgianMkhedruli, /// - [XmlEnumAttribute("Glag - Glagolitic")] + [XmlEnum("Glag - Glagolitic")] GlagGlagolitic, /// - [XmlEnumAttribute("Goth - Gothic")] + [XmlEnum("Goth - Gothic")] GothGothic, /// - [XmlEnumAttribute("Gran - Grantha")] + [XmlEnum("Gran - Grantha")] GranGrantha, /// - [XmlEnumAttribute("Grek - Greek")] + [XmlEnum("Grek - Greek")] GrekGreek, /// - [XmlEnumAttribute("Gujr - Gujarati")] + [XmlEnum("Gujr - Gujarati")] GujrGujarati, /// - [XmlEnumAttribute("Guru - Gurmukhi")] + [XmlEnum("Guru - Gurmukhi")] GuruGurmukhi, /// - [XmlEnumAttribute("Hanb - Han with Bopomofo")] + [XmlEnum("Hanb - Han with Bopomofo")] HanbHanwithBopomofo, /// - [XmlEnumAttribute("Hang - Hangul")] + [XmlEnum("Hang - Hangul")] HangHangul, /// - [XmlEnumAttribute("Hani - Han (Hanzi, Kanji, Hanja)")] + [XmlEnum("Hani - Han (Hanzi, Kanji, Hanja)")] HaniHanHanziKanjiHanja, /// - [XmlEnumAttribute("Hano - Hanunoo (Hanunóo)")] + [XmlEnum("Hano - Hanunoo (Hanunóo)")] HanoHanunooHanunóo, /// - [XmlEnumAttribute("Hans - Han (Simplified variant)")] + [XmlEnum("Hans - Han (Simplified variant)")] HansHanSimplifiedVariant, /// - [XmlEnumAttribute("Hant - Han (Traditional variant)")] + [XmlEnum("Hant - Han (Traditional variant)")] HantHanTraditionalVariant, /// - [XmlEnumAttribute("Hatr - Hatran")] + [XmlEnum("Hatr - Hatran")] HatrHatran, /// - [XmlEnumAttribute("Hebr - Hebrew")] + [XmlEnum("Hebr - Hebrew")] HebrHebrew, /// - [XmlEnumAttribute("Hira - Hiragana")] + [XmlEnum("Hira - Hiragana")] HiraHiragana, /// - [XmlEnumAttribute("Hluw - Anatolian Hieroglyphs")] + [XmlEnum("Hluw - Anatolian Hieroglyphs")] HluwAnatolianHieroglyphs, /// - [XmlEnumAttribute("Hmng - Pahawh Hmong")] + [XmlEnum("Hmng - Pahawh Hmong")] HmngPahawhHmong, /// - [XmlEnumAttribute("Hrkt - Japanese syllabaries")] + [XmlEnum("Hrkt - Japanese syllabaries")] HrktJapaneseSyllabaries, /// - [XmlEnumAttribute("Hung - Old Hungarian (Hungarian Runic)")] + [XmlEnum("Hung - Old Hungarian (Hungarian Runic)")] HungOldHungarianHungarianRunic, /// - [XmlEnumAttribute("Inds - Indus (Harappan)")] + [XmlEnum("Inds - Indus (Harappan)")] IndsIndusHarappan, /// - [XmlEnumAttribute("Ital - Old Italic (Etruscan, Oscan etc.)")] + [XmlEnum("Ital - Old Italic (Etruscan, Oscan etc.)")] ItalOldItalicEtruscanOscanEtc, /// - [XmlEnumAttribute("Jamo - Jamo")] + [XmlEnum("Jamo - Jamo")] JamoJamo, /// - [XmlEnumAttribute("Java - Javanese")] + [XmlEnum("Java - Javanese")] JavaJavanese, /// - [XmlEnumAttribute("Jpan - Japanese")] + [XmlEnum("Jpan - Japanese")] JpanJapanese, /// - [XmlEnumAttribute("Jurc - Jurchen")] + [XmlEnum("Jurc - Jurchen")] JurcJurchen, /// - [XmlEnumAttribute("Kali - Kayah Li")] + [XmlEnum("Kali - Kayah Li")] KaliKayahLi, /// - [XmlEnumAttribute("Kana - Katakana")] + [XmlEnum("Kana - Katakana")] KanaKatakana, /// - [XmlEnumAttribute("Khar - Kharoshthi")] + [XmlEnum("Khar - Kharoshthi")] KharKharoshthi, /// - [XmlEnumAttribute("Khmr - Khmer")] + [XmlEnum("Khmr - Khmer")] KhmrKhmer, /// - [XmlEnumAttribute("Khoj - Khojki")] + [XmlEnum("Khoj - Khojki")] KhojKhojki, /// - [XmlEnumAttribute("Kitl - Khitan large script")] + [XmlEnum("Kitl - Khitan large script")] KitlKhitanlargescript, /// - [XmlEnumAttribute("Kits - Khitan small script")] + [XmlEnum("Kits - Khitan small script")] KitsKhitansmallscript, /// - [XmlEnumAttribute("Knda - Kannada")] + [XmlEnum("Knda - Kannada")] KndaKannada, /// - [XmlEnumAttribute("Kore - Korean (alias for Hangul + Han)")] + [XmlEnum("Kore - Korean (alias for Hangul + Han)")] KoreKoreanaliasforHangulHan, /// - [XmlEnumAttribute("Kpel - Kpelle")] + [XmlEnum("Kpel - Kpelle")] KpelKpelle, /// - [XmlEnumAttribute("Kthi - Kaithi")] + [XmlEnum("Kthi - Kaithi")] KthiKaithi, /// - [XmlEnumAttribute("Lana - Tai Tham (Lanna)")] + [XmlEnum("Lana - Tai Tham (Lanna)")] LanaTaiThamLanna, /// - [XmlEnumAttribute("Laoo - Lao")] + [XmlEnum("Laoo - Lao")] LaooLao, /// - [XmlEnumAttribute("Latf - Latin (Fraktur variant)")] + [XmlEnum("Latf - Latin (Fraktur variant)")] LatfLatinFrakturvariant, /// - [XmlEnumAttribute("Latg - Latin (Gaelic variant)")] + [XmlEnum("Latg - Latin (Gaelic variant)")] LatgLatinGaelicvariant, /// - [XmlEnumAttribute("Latn - Latin")] + [XmlEnum("Latn - Latin")] LatnLatin, /// - [XmlEnumAttribute("Leke - Leke")] + [XmlEnum("Leke - Leke")] LekeLeke, /// - [XmlEnumAttribute("Lepc - Lepcha (Róng)")] + [XmlEnum("Lepc - Lepcha (Róng)")] LepcLepchaRóng, /// - [XmlEnumAttribute("Limb - Limbu")] + [XmlEnum("Limb - Limbu")] LimbLimbu, /// - [XmlEnumAttribute("Lina - Linear A")] + [XmlEnum("Lina - Linear A")] LinaLinearA, /// - [XmlEnumAttribute("Linb - Linear B")] + [XmlEnum("Linb - Linear B")] LinbLinearB, /// - [XmlEnumAttribute("Lisu - Lisu (Fraser)")] + [XmlEnum("Lisu - Lisu (Fraser)")] LisuLisuFraser, /// - [XmlEnumAttribute("Loma - Loma")] + [XmlEnum("Loma - Loma")] LomaLoma, /// - [XmlEnumAttribute("Lyci - Lycian")] + [XmlEnum("Lyci - Lycian")] LyciLycian, /// - [XmlEnumAttribute("Lydi - Lydian")] + [XmlEnum("Lydi - Lydian")] LydiLydian, /// - [XmlEnumAttribute("Mahj - Mahajani")] + [XmlEnum("Mahj - Mahajani")] MahjMahajani, /// - [XmlEnumAttribute("Mand - Mandaic, Mandaean")] + [XmlEnum("Mand - Mandaic, Mandaean")] MandMandaicMandaean, /// - [XmlEnumAttribute("Mani - Manichaean")] + [XmlEnum("Mani - Manichaean")] ManiManichaean, /// - [XmlEnumAttribute("Marc - Marchen")] + [XmlEnum("Marc - Marchen")] MarcMarchen, /// - [XmlEnumAttribute("Maya - Mayan hieroglyphs")] + [XmlEnum("Maya - Mayan hieroglyphs")] MayaMayanhieroglyphs, /// - [XmlEnumAttribute("Mend - Mende Kikakui")] + [XmlEnum("Mend - Mende Kikakui")] MendMendeKikakui, /// - [XmlEnumAttribute("Merc - Meroitic Cursive")] + [XmlEnum("Merc - Meroitic Cursive")] MercMeroiticCursive, /// - [XmlEnumAttribute("Mero - Meroitic Hieroglyphs")] + [XmlEnum("Mero - Meroitic Hieroglyphs")] MeroMeroiticHieroglyphs, /// - [XmlEnumAttribute("Mlym - Malayalam")] + [XmlEnum("Mlym - Malayalam")] MlymMalayalam, /// - [XmlEnumAttribute("Modi - Modi, Moḍī")] + [XmlEnum("Modi - Modi, Moḍī")] ModiModiMoḍī, /// - [XmlEnumAttribute("Mong - Mongolian")] + [XmlEnum("Mong - Mongolian")] MongMongolian, /// - [XmlEnumAttribute("Moon - Moon (Moon code, Moon script, Moon type)")] + [XmlEnum("Moon - Moon (Moon code, Moon script, Moon type)")] MoonMoonMooncodeMoonscriptMoontype, /// - [XmlEnumAttribute("Mroo - Mro, Mru")] + [XmlEnum("Mroo - Mro, Mru")] MrooMroMru, /// - [XmlEnumAttribute("Mtei - Meitei Mayek (Meithei, Meetei)")] + [XmlEnum("Mtei - Meitei Mayek (Meithei, Meetei)")] MteiMeiteiMayekMeitheiMeetei, /// - [XmlEnumAttribute("Mult - Multani")] + [XmlEnum("Mult - Multani")] MultMultani, /// - [XmlEnumAttribute("Mymr - Myanmar (Burmese)")] + [XmlEnum("Mymr - Myanmar (Burmese)")] MymrMyanmarBurmese, /// - [XmlEnumAttribute("Narb - Old North Arabian (Ancient North Arabian)")] + [XmlEnum("Narb - Old North Arabian (Ancient North Arabian)")] NarbOldNorthArabianAncientNorthArabian, /// - [XmlEnumAttribute("Nbat - Nabataean")] + [XmlEnum("Nbat - Nabataean")] NbatNabataean, /// - [XmlEnumAttribute("Newa - Newa, Newar, Newari")] + [XmlEnum("Newa - Newa, Newar, Newari")] NewaNewaNewarNewari, /// - [XmlEnumAttribute("Nkgb - Nakhi Geba")] + [XmlEnum("Nkgb - Nakhi Geba")] NkgbNakhiGeba, /// - [XmlEnumAttribute("Nkoo - N’Ko")] + [XmlEnum("Nkoo - N’Ko")] NkooNKo, /// - [XmlEnumAttribute("Nshu - Nüshu")] + [XmlEnum("Nshu - Nüshu")] NshuNüshu, /// - [XmlEnumAttribute("Ogam - Ogham")] + [XmlEnum("Ogam - Ogham")] OgamOgham, /// - [XmlEnumAttribute("Olck - Ol Chiki (Ol Cemet’, Ol, Santali)")] + [XmlEnum("Olck - Ol Chiki (Ol Cemet’, Ol, Santali)")] OlckOlChikiOlCemetOlSantali, /// - [XmlEnumAttribute("Orkh - Old Turkic, Orkhon Runic")] + [XmlEnum("Orkh - Old Turkic, Orkhon Runic")] OrkhOldTurkicOrkhonRunic, /// - [XmlEnumAttribute("Orya - Oriya")] + [XmlEnum("Orya - Oriya")] OryaOriya, /// - [XmlEnumAttribute("Osge - Osage")] + [XmlEnum("Osge - Osage")] OsgeOsage, /// - [XmlEnumAttribute("Osma - Osmanya")] + [XmlEnum("Osma - Osmanya")] OsmaOsmanya, /// - [XmlEnumAttribute("Palm - Palmyrene")] + [XmlEnum("Palm - Palmyrene")] PalmPalmyrene, /// - [XmlEnumAttribute("Pauc - Pau Cin Hau")] + [XmlEnum("Pauc - Pau Cin Hau")] PaucPauCinHau, /// - [XmlEnumAttribute("Perm - Old Permic")] + [XmlEnum("Perm - Old Permic")] PermOldPermic, /// - [XmlEnumAttribute("Phag - Phags-pa")] + [XmlEnum("Phag - Phags-pa")] PhagPhagspa, /// - [XmlEnumAttribute("Phli - Inscriptional Pahlavi")] + [XmlEnum("Phli - Inscriptional Pahlavi")] PhliInscriptionalPahlavi, /// - [XmlEnumAttribute("Phlp - Psalter Pahlavi")] + [XmlEnum("Phlp - Psalter Pahlavi")] PhlpPsalterPahlavi, /// - [XmlEnumAttribute("Phlv - Book Pahlavi")] + [XmlEnum("Phlv - Book Pahlavi")] PhlvBookPahlavi, /// - [XmlEnumAttribute("Phnx - Phoenician")] + [XmlEnum("Phnx - Phoenician")] PhnxPhoenician, /// - [XmlEnumAttribute("Piqd - Klingon (KLI pIqaD)")] + [XmlEnum("Piqd - Klingon (KLI pIqaD)")] PiqdKlingonKLIpIqaD, /// - [XmlEnumAttribute("Plrd - Miao (Pollard)")] + [XmlEnum("Plrd - Miao (Pollard)")] PlrdMiaoPollard, /// - [XmlEnumAttribute("Prti - Inscriptional Parthian")] + [XmlEnum("Prti - Inscriptional Parthian")] PrtiInscriptionalParthian, /// - [XmlEnumAttribute("Rjng - Rejang (Redjang, Kaganga)")] + [XmlEnum("Rjng - Rejang (Redjang, Kaganga)")] RjngRejangRedjangKaganga, /// - [XmlEnumAttribute("Roro - Rongorongo")] + [XmlEnum("Roro - Rongorongo")] RoroRongorongo, /// - [XmlEnumAttribute("Runr - Runic")] + [XmlEnum("Runr - Runic")] RunrRunic, /// - [XmlEnumAttribute("Samr - Samaritan")] + [XmlEnum("Samr - Samaritan")] SamrSamaritan, /// - [XmlEnumAttribute("Sara - Sarati")] + [XmlEnum("Sara - Sarati")] SaraSarati, /// - [XmlEnumAttribute("Sarb - Old South Arabian")] + [XmlEnum("Sarb - Old South Arabian")] SarbOldSouthArabian, /// - [XmlEnumAttribute("Saur - Saurashtra")] + [XmlEnum("Saur - Saurashtra")] SaurSaurashtra, /// - [XmlEnumAttribute("Sgnw - SignWriting")] + [XmlEnum("Sgnw - SignWriting")] SgnwSignWriting, /// - [XmlEnumAttribute("Shaw - Shavian (Shaw)")] + [XmlEnum("Shaw - Shavian (Shaw)")] ShawShavianShaw, /// - [XmlEnumAttribute("Shrd - Sharada, Śāradā")] + [XmlEnum("Shrd - Sharada, Śāradā")] ShrdSharadaŚāradā, /// - [XmlEnumAttribute("Sidd - Siddham")] + [XmlEnum("Sidd - Siddham")] SiddSiddham, /// - [XmlEnumAttribute("Sind - Khudawadi, Sindhi")] + [XmlEnum("Sind - Khudawadi, Sindhi")] SindKhudawadiSindhi, /// - [XmlEnumAttribute("Sinh - Sinhala")] + [XmlEnum("Sinh - Sinhala")] SinhSinhala, /// - [XmlEnumAttribute("Sora - Sora Sompeng")] + [XmlEnum("Sora - Sora Sompeng")] SoraSoraSompeng, /// - [XmlEnumAttribute("Sund - Sundanese")] + [XmlEnum("Sund - Sundanese")] SundSundanese, /// - [XmlEnumAttribute("Sylo - Syloti Nagri")] + [XmlEnum("Sylo - Syloti Nagri")] SyloSylotiNagri, /// - [XmlEnumAttribute("Syrc - Syriac")] + [XmlEnum("Syrc - Syriac")] SyrcSyriac, /// - [XmlEnumAttribute("Syre - Syriac (Estrangelo variant)")] + [XmlEnum("Syre - Syriac (Estrangelo variant)")] SyreSyriacEstrangeloVariant, /// - [XmlEnumAttribute("Syrj - Syriac (Western variant)")] + [XmlEnum("Syrj - Syriac (Western variant)")] SyrjSyriacWesternVariant, /// - [XmlEnumAttribute("Syrn - Syriac (Eastern variant)")] + [XmlEnum("Syrn - Syriac (Eastern variant)")] SyrnSyriacEasternVariant, /// - [XmlEnumAttribute("Tagb - Tagbanwa")] + [XmlEnum("Tagb - Tagbanwa")] TagbTagbanwa, /// - [XmlEnumAttribute("Takr - Takri")] + [XmlEnum("Takr - Takri")] TakrTakri, /// - [XmlEnumAttribute("Tale - Tai Le")] + [XmlEnum("Tale - Tai Le")] TaleTaiLe, /// - [XmlEnumAttribute("Talu - New Tai Lue")] + [XmlEnum("Talu - New Tai Lue")] TaluNewTaiLue, /// - [XmlEnumAttribute("Taml - Tamil")] + [XmlEnum("Taml - Tamil")] TamlTamil, /// - [XmlEnumAttribute("Tang - Tangut")] + [XmlEnum("Tang - Tangut")] TangTangut, /// - [XmlEnumAttribute("Tavt - Tai Viet")] + [XmlEnum("Tavt - Tai Viet")] TavtTaiViet, /// - [XmlEnumAttribute("Telu - Telugu")] + [XmlEnum("Telu - Telugu")] TeluTelugu, /// - [XmlEnumAttribute("Teng - Tengwar")] + [XmlEnum("Teng - Tengwar")] TengTengwar, /// - [XmlEnumAttribute("Tfng - Tifinagh (Berber)")] + [XmlEnum("Tfng - Tifinagh (Berber)")] TfngTifinaghBerber, /// - [XmlEnumAttribute("Tglg - Tagalog (Baybayin, Alibata)")] + [XmlEnum("Tglg - Tagalog (Baybayin, Alibata)")] TglgTagalogBaybayinAlibata, /// - [XmlEnumAttribute("Thaa - Thaana")] + [XmlEnum("Thaa - Thaana")] ThaaThaana, /// - [XmlEnumAttribute("Thai - Thai")] + [XmlEnum("Thai - Thai")] ThaiThai, /// - [XmlEnumAttribute("Tibt - Tibetan")] + [XmlEnum("Tibt - Tibetan")] TibtTibetan, /// - [XmlEnumAttribute("Tirh - Tirhuta")] + [XmlEnum("Tirh - Tirhuta")] TirhTirhuta, /// - [XmlEnumAttribute("Ugar - Ugaritic")] + [XmlEnum("Ugar - Ugaritic")] UgarUgaritic, /// - [XmlEnumAttribute("Vaii - Vai")] + [XmlEnum("Vaii - Vai")] VaiiVai, /// - [XmlEnumAttribute("Visp - Visible Speech")] + [XmlEnum("Visp - Visible Speech")] VispVisibleSpeech, /// - [XmlEnumAttribute("Wara - Warang Citi (Varang Kshiti)")] + [XmlEnum("Wara - Warang Citi (Varang Kshiti)")] WaraWarangCitiVarangKshiti, /// - [XmlEnumAttribute("Wole - Woleai")] + [XmlEnum("Wole - Woleai")] WoleWoleai, /// - [XmlEnumAttribute("Xpeo - Old Persian")] + [XmlEnum("Xpeo - Old Persian")] XpeoOldPersian, /// - [XmlEnumAttribute("Xsux - Cuneiform, Sumero-Akkadian")] + [XmlEnum("Xsux - Cuneiform, Sumero-Akkadian")] XsuxCuneiformSumeroAkkadian, /// - [XmlEnumAttribute("Yiii - Yi")] + [XmlEnum("Yiii - Yi")] YiiiYi, /// - [XmlEnumAttribute("Zinh - Code for inherited script")] + [XmlEnum("Zinh - Code for inherited script")] ZinhCodeForInheritedScript, /// - [XmlEnumAttribute("Zmth - Mathematical notation")] + [XmlEnum("Zmth - Mathematical notation")] ZmthMathematicalNotation, /// - [XmlEnumAttribute("Zsye - Symbols (Emoji variant)")] + [XmlEnum("Zsye - Symbols (Emoji variant)")] ZsyeSymbolsEmojiVariant, /// - [XmlEnumAttribute("Zsym - Symbols")] + [XmlEnum("Zsym - Symbols")] ZsymSymbols, /// - [XmlEnumAttribute("Zxxx - Code for unwritten documents")] + [XmlEnum("Zxxx - Code for unwritten documents")] ZxxxCodeForUnwrittenDocuments, /// - [XmlEnumAttribute("Zyyy - Code for undetermined script")] + [XmlEnum("Zyyy - Code for undetermined script")] ZyyyCodeForUndeterminedScript, /// - [XmlEnumAttribute("Zzzz - Code for uncoded script")] + [XmlEnum("Zzzz - Code for uncoded script")] ZzzzCodeForUncodedScript, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlSeparatorRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlSeparatorRegion.cs similarity index 83% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlSeparatorRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlSeparatorRegion.cs index 49916e2b..9201c34a 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlSeparatorRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlSeparatorRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -14,11 +14,11 @@ /// different articles from each other. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlSeparatorRegion : PageXmlRegion { @@ -37,7 +37,7 @@ /// (negative values indicate anti-clockwise rotation). /// Range: -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -52,7 +52,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -68,7 +68,7 @@ /// /// The colour of the separator /// - [XmlAttributeAttribute("colour")] + [XmlAttribute("colour")] public PageXmlColourSimpleType Colour { get @@ -83,7 +83,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ColourSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTableCellRole.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTableCellRole.cs similarity index 85% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTableCellRole.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTableCellRole.cs index 42118619..efbeccaf 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTableCellRole.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTableCellRole.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Data for a region that takes on the role of a table cell within a parent table region. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlTableCellRole { @@ -39,7 +39,7 @@ /// /// Cell position in table starting with row 0 /// - [XmlAttributeAttribute("rowIndex")] + [XmlAttribute("rowIndex")] public int RowIndex { get @@ -55,7 +55,7 @@ /// /// Cell position in table starting with column 0 /// - [XmlAttributeAttribute("columnIndex")] + [XmlAttribute("columnIndex")] public int ColumnIndex { get @@ -71,7 +71,7 @@ /// /// Number of rows the cell spans (optional; default is 1) /// - [XmlAttributeAttribute("rowSpan")] + [XmlAttribute("rowSpan")] public int RowSpan { get @@ -86,7 +86,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool RowSpanSpecified { get @@ -102,7 +102,7 @@ /// /// Number of columns the cell spans (optional; default is 1) /// - [XmlAttributeAttribute("colSpan")] + [XmlAttribute("colSpan")] public int ColSpan { get @@ -117,7 +117,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ColSpanSpecified { get @@ -133,7 +133,7 @@ /// /// Is the cell a column or row header? /// - [XmlAttributeAttribute("header")] + [XmlAttribute("header")] public bool Header { get @@ -148,7 +148,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool HeaderSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTableRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTableRegion.cs similarity index 88% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTableRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTableRegion.cs index 3c3eabdc..2c6863d1 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTableRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTableRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -14,11 +14,11 @@ /// lines; these lines are not separator regions. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlTableRegion : PageXmlRegion { #region private @@ -56,7 +56,7 @@ /// /// Table grid (visible or virtual grid lines) /// - [XmlArrayItemAttribute("GridPoints", IsNullable = false)] + [XmlArrayItem("GridPoints", IsNullable = false)] public PageXmlGridPoints[] Grid { get @@ -76,7 +76,7 @@ /// (negative values indicate anti-clockwise rotation). /// Range: -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -91,7 +91,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -107,7 +107,7 @@ /// /// The number of rows present in the table /// - [XmlAttributeAttribute("rows")] + [XmlAttribute("rows")] public int Rows { get @@ -122,7 +122,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool RowsSpecified { get @@ -138,7 +138,7 @@ /// /// The number of columns present in the table /// - [XmlAttributeAttribute("columns")] + [XmlAttribute("columns")] public int Columns { get @@ -153,7 +153,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ColumnsSpecified { get @@ -169,7 +169,7 @@ /// /// The colour of the lines used in the region /// - [XmlAttributeAttribute("lineColour")] + [XmlAttribute("lineColour")] public PageXmlColourSimpleType LineColour { get @@ -184,7 +184,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool LineColourSpecified { get @@ -200,7 +200,7 @@ /// /// The background colour of the region /// - [XmlAttributeAttribute("bgColour")] + [XmlAttribute("bgColour")] public PageXmlColourSimpleType BgColour { get @@ -215,7 +215,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool BgColourSpecified { get @@ -231,7 +231,7 @@ /// /// Specifies the presence of line separators /// - [XmlAttributeAttribute("lineSeparators")] + [XmlAttribute("lineSeparators")] public bool LineSeparators { get @@ -246,7 +246,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool LineSeparatorsSpecified { get @@ -262,7 +262,7 @@ /// /// Specifies whether the region also contains text /// - [XmlAttributeAttribute("embText")] + [XmlAttribute("embText")] public bool EmbText { get @@ -277,7 +277,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool EmbTextSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextDataSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextDataSimpleType.cs similarity index 74% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextDataSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextDataSimpleType.cs index bc51c578..1d428003 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextDataSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextDataSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,64 +9,64 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlTextDataSimpleType { /// /// Examples: "123.456", "+1234.456", "-1234.456", "-.456", "-456" /// - [XmlEnumAttribute("xsd:double")] + [XmlEnum("xsd:double")] Xsddouble, /// /// Examples: "123.456", "+1234.456", "-1.2344e56", "-.45E-6", "INF", "-INF", "NaN" /// - [XmlEnumAttribute("xsd:float")] + [XmlEnum("xsd:float")] XsdFloat, /// /// Examples: "123456", "+00000012", "-1", "-456" /// - [XmlEnumAttribute("xsd:integer")] + [XmlEnum("xsd:integer")] XsdInteger, /// /// Examples: "true", "false", "1", "0" /// - [XmlEnumAttribute("xsd:boolean")] + [XmlEnum("xsd:boolean")] XsdBoolean, /// /// Examples: "2001-10-26", "2001-10-26+02:00", "2001-10-26Z", "2001-10-26+00:00", "-2001-10-26", "-20000-04-01" /// - [XmlEnumAttribute("xsd:date")] + [XmlEnum("xsd:date")] XsdDate, /// /// Examples: "21:32:52", "21:32:52+02:00", "19:32:52Z", "19:32:52+00:00", "21:32:52.12679" /// - [XmlEnumAttribute("xsd:time")] + [XmlEnum("xsd:time")] XsdTime, /// /// Examples: "2001-10-26T21:32:52", "2001-10-26T21:32:52+02:00", "2001-10-26T19:32:52Z", "2001-10-26T19:32:52+00:00","-2001-10-26T21:32:52", "2001-10-26T21:32:52.12679" /// - [XmlEnumAttribute("xsd:dateTime")] + [XmlEnum("xsd:dateTime")] XsdDateTime, /// /// Generic text string /// - [XmlEnumAttribute("xsd:string")] + [XmlEnum("xsd:string")] XsdString, /// /// An XSD type that is not listed or a custom type (use dataTypeDetails attribute). /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextEquiv.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextEquiv.cs similarity index 88% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextEquiv.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextEquiv.cs index 8323af04..c00d926a 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextEquiv.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextEquiv.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -10,11 +10,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlTextEquiv { #region private @@ -75,7 +75,7 @@ /// Used for sort order in case multiple TextEquivs are defined. /// The text content with the lowest index should be interpreted as the main text content. /// - [XmlAttributeAttribute("index", DataType = "integer")] + [XmlAttribute("index", DataType = "integer")] public string Index { get @@ -89,7 +89,7 @@ } /// - [XmlAttributeAttribute("conf")] + [XmlAttribute("conf")] public float Conf { get @@ -104,7 +104,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ConfSpecified { get @@ -121,7 +121,7 @@ /// Type of text content (is it free text or a number, for instance). This is only /// a descriptive attribute, the text type is not checked during XML validation. /// - [XmlAttributeAttribute("dataType")] + [XmlAttribute("dataType")] public PageXmlTextDataSimpleType DataType { get @@ -136,7 +136,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool DataTypeSpecified { get @@ -152,7 +152,7 @@ /// /// Refinement for dataType attribute. Can be a regular expression, for instance. /// - [XmlAttributeAttribute("dataTypeDetails")] + [XmlAttribute("dataTypeDetails")] public string DataTypeDetails { get @@ -166,7 +166,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextLine.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextLine.cs similarity index 88% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextLine.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextLine.cs index 33e7bbee..6c7b7993 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextLine.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextLine.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -11,11 +11,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlTextLine { #region private @@ -69,7 +69,7 @@ /// /// Alternative text line images (e.g. black-and-white) /// - [XmlElementAttribute("AlternativeImage")] + [XmlElement("AlternativeImage")] public PageXmlAlternativeImage[] AlternativeImages { get @@ -111,7 +111,7 @@ } /// - [XmlElementAttribute("Word")] + [XmlElement("Word")] public PageXmlWord[] Words { get @@ -125,7 +125,7 @@ } /// - [XmlElementAttribute("TextEquiv")] + [XmlElement("TextEquiv")] public PageXmlTextEquiv[] TextEquivs { get @@ -152,7 +152,7 @@ } /// - [XmlArrayItemAttribute("UserAttribute", IsNullable = false)] + [XmlArrayItem("UserAttribute", IsNullable = false)] public PageXmlUserAttribute[] UserDefined { get @@ -168,7 +168,7 @@ /// /// Semantic labels / tags /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -182,7 +182,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -196,7 +196,7 @@ } /// - [XmlAttributeAttribute("primaryLanguage")] + [XmlAttribute("primaryLanguage")] public PageXmlLanguageSimpleType PrimaryLanguage { get @@ -211,7 +211,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool PrimaryLanguageSpecified { get @@ -225,7 +225,7 @@ } /// - [XmlAttributeAttribute("primaryScript")] + [XmlAttribute("primaryScript")] public PageXmlScriptSimpleType PrimaryScript { get @@ -240,7 +240,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool PrimaryScriptSpecified { get @@ -254,7 +254,7 @@ } /// - [XmlAttributeAttribute("secondaryScript")] + [XmlAttribute("secondaryScript")] public PageXmlScriptSimpleType SecondaryScript { get @@ -269,7 +269,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SecondaryScriptSpecified { get @@ -283,7 +283,7 @@ } /// - [XmlAttributeAttribute("readingDirection")] + [XmlAttribute("readingDirection")] public PageXmlReadingDirectionSimpleType ReadingDirection { get @@ -298,7 +298,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ReadingDirectionSpecified { get @@ -312,7 +312,7 @@ } /// - [XmlAttributeAttribute("production")] + [XmlAttribute("production")] public PageXmlProductionSimpleType Production { get @@ -327,7 +327,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ProductionSpecified { get @@ -341,7 +341,7 @@ } /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -355,7 +355,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get @@ -369,7 +369,7 @@ } /// - [XmlAttributeAttribute()] + [XmlAttribute()] public int Index { get @@ -384,7 +384,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool IndexSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextLineOrderSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextLineOrderSimpleType.cs similarity index 56% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextLineOrderSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextLineOrderSimpleType.cs index 300c728a..86b22f35 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextLineOrderSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextLineOrderSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,26 +9,26 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlTextLineOrderSimpleType { /// - [XmlEnumAttribute("top-to-bottom")] + [XmlEnum("top-to-bottom")] TopToBottom, /// - [XmlEnumAttribute("bottom-to-top")] + [XmlEnum("bottom-to-top")] BottomToTop, /// - [XmlEnumAttribute("left-to-right")] + [XmlEnum("left-to-right")] LeftToRight, /// - [XmlEnumAttribute("right-to-left")] + [XmlEnum("right-to-left")] RightToLeft, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextRegion.cs similarity index 90% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextRegion.cs index e4ec423c..9be6d48f 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -13,11 +13,11 @@ /// ornate text may be considered as a graphic. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlTextRegion : PageXmlRegion { #region private methods @@ -81,7 +81,7 @@ #endregion /// - [XmlElementAttribute("TextLine")] + [XmlElement("TextLine")] public PageXmlTextLine[] TextLines { get @@ -95,7 +95,7 @@ } /// - [XmlElementAttribute("TextEquiv")] + [XmlElement("TextEquiv")] public PageXmlTextEquiv[] TextEquivs { get @@ -130,7 +130,7 @@ /// via “AlternativeImage”.) /// Range: -179.999,180 /// - [XmlAttributeAttribute("orientation")] + [XmlAttribute("orientation")] public float Orientation { get @@ -145,7 +145,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool OrientationSpecified { get @@ -161,7 +161,7 @@ /// /// The nature of the text in the region /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlTextSimpleType Type { get @@ -176,7 +176,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -193,7 +193,7 @@ /// The degree of space in points between the lines of /// text(line spacing) /// - [XmlAttributeAttribute("leading")] + [XmlAttribute("leading")] public int Leading { get @@ -208,7 +208,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool LeadingSpecified { get @@ -226,7 +226,7 @@ /// should be read(order of words and characters), /// in addition to “textLineOrder”. /// - [XmlAttributeAttribute("readingDirection")] + [XmlAttribute("readingDirection")] public PageXmlReadingDirectionSimpleType ReadingDirection { get @@ -241,7 +241,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ReadingDirectionSpecified { get @@ -258,7 +258,7 @@ /// The order of text lines within the block, /// in addition to “readingDirection”. /// - [XmlAttributeAttribute("textLineOrder")] + [XmlAttribute("textLineOrder")] public PageXmlTextLineOrderSimpleType TextLineOrder { get @@ -273,7 +273,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TextLineOrderSpecified { get @@ -295,7 +295,7 @@ /// (negative values indicate anti-clockwise rotation). /// Range: -179.999,180 /// - [XmlAttributeAttribute("readingOrientation")] + [XmlAttribute("readingOrientation")] public float ReadingOrientation { get @@ -310,7 +310,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ReadingOrientationSpecified { get @@ -326,7 +326,7 @@ /// /// Defines whether a region of text is indented or not /// - [XmlAttributeAttribute("indented")] + [XmlAttribute("indented")] public bool Indented { get @@ -341,7 +341,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool IndentedSpecified { get @@ -357,7 +357,7 @@ /// /// Text align /// - [XmlAttributeAttribute("align")] + [XmlAttribute("align")] public PageXmlAlignSimpleType Align { get @@ -372,7 +372,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool AlignSpecified { get @@ -388,7 +388,7 @@ /// /// The primary language used in the region /// - [XmlAttributeAttribute("primaryLanguage")] + [XmlAttribute("primaryLanguage")] public PageXmlLanguageSimpleType PrimaryLanguage { get @@ -403,7 +403,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool PrimaryLanguageSpecified { get @@ -419,7 +419,7 @@ /// /// The secondary language used in the region /// - [XmlAttributeAttribute("secondaryLanguage")] + [XmlAttribute("secondaryLanguage")] public PageXmlLanguageSimpleType SecondaryLanguage { get @@ -434,7 +434,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SecondaryLanguageSpecified { get @@ -450,7 +450,7 @@ /// /// The primary script used in the region /// - [XmlAttributeAttribute("primaryScript")] + [XmlAttribute("primaryScript")] public PageXmlScriptSimpleType PrimaryScript { get @@ -465,7 +465,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool PrimaryScriptSpecified { get @@ -481,7 +481,7 @@ /// /// The secondary script used in the region /// - [XmlAttributeAttribute("secondaryScript")] + [XmlAttribute("secondaryScript")] public PageXmlScriptSimpleType SecondaryScript { get @@ -496,7 +496,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SecondaryScriptSpecified { get @@ -510,7 +510,7 @@ } /// - [XmlAttributeAttribute("production")] + [XmlAttribute("production")] public PageXmlProductionSimpleType Production { get @@ -525,7 +525,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ProductionSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextSimpleType.cs similarity index 69% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextSimpleType.cs index b8d7c0e9..42f6cb84 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,118 +9,118 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlTextSimpleType { /// /// Paragraph /// - [XmlEnumAttribute("paragraph")] + [XmlEnum("paragraph")] Paragraph, /// /// Heading /// - [XmlEnumAttribute("heading")] + [XmlEnum("heading")] Heading, /// /// Caption /// - [XmlEnumAttribute("caption")] + [XmlEnum("caption")] Caption, /// /// Header /// - [XmlEnumAttribute("header")] + [XmlEnum("header")] Header, /// /// Footer /// - [XmlEnumAttribute("footer")] + [XmlEnum("footer")] Footer, /// /// Page number /// - [XmlEnumAttribute("page-number")] + [XmlEnum("page-number")] PageNumber, /// /// Drop Capital, a letter a the beginning of a word that is bigger than the usual character size. Usually to start a chapter. /// - [XmlEnumAttribute("drop-capital")] + [XmlEnum("drop-capital")] DropCapital, /// /// Credit /// - [XmlEnumAttribute("credit")] + [XmlEnum("credit")] Credit, /// /// Floating /// - [XmlEnumAttribute("floating")] + [XmlEnum("floating")] Floating, /// /// Signature mark /// - [XmlEnumAttribute("signature-mark")] + [XmlEnum("signature-mark")] SignatureMark, /// /// Catch word /// - [XmlEnumAttribute("catch-word")] + [XmlEnum("catch-word")] CatchWord, /// /// Marginalia /// - [XmlEnumAttribute("marginalia")] + [XmlEnum("marginalia")] Marginalia, /// /// Foot note /// - [XmlEnumAttribute("footnote")] + [XmlEnum("footnote")] FootNote, /// /// Foot note - continued /// - [XmlEnumAttribute("footnote-continued")] + [XmlEnum("footnote-continued")] FootNoteContinued, /// /// End note /// - [XmlEnumAttribute("endnote")] + [XmlEnum("endnote")] EndNote, /// /// Table of content /// - [XmlEnumAttribute("TOC-entry")] + [XmlEnum("TOC-entry")] TocEntry, /// /// List /// - [XmlEnumAttribute("list-label")] + [XmlEnum("list-label")] LisLabel, /// /// Other /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextStyle.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextStyle.cs similarity index 89% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextStyle.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextStyle.cs index c83defe6..46357199 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlTextStyle.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlTextStyle.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -13,11 +13,11 @@ /// proportional font. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlTextStyle { #region private @@ -99,7 +99,7 @@ /// Add more information if necessary /// (e.g.blackletter, antiqua). /// - [XmlAttributeAttribute("fontFamily")] + [XmlAttribute("fontFamily")] public string FontFamily { get @@ -115,7 +115,7 @@ /// /// Serif or sans-serif typeface. /// - [XmlAttributeAttribute("serif")] + [XmlAttribute("serif")] public bool Serif { get @@ -130,7 +130,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SerifSpecified { get @@ -144,7 +144,7 @@ } /// - [XmlAttributeAttribute("monospace")] + [XmlAttribute("monospace")] public bool Monospace { get @@ -159,7 +159,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool MonospaceSpecified { get @@ -175,7 +175,7 @@ /// /// The size of the characters in points. /// - [XmlAttributeAttribute("fontSize")] + [XmlAttribute("fontSize")] public float FontSize { get @@ -190,7 +190,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool FontSizeSpecified { get @@ -209,7 +209,7 @@ /// lower-case letters in a typeface. /// The unit is assumed to be pixels. /// - [XmlAttributeAttribute("xHeight", DataType = "integer")] + [XmlAttribute("xHeight", DataType = "integer")] public string XHeight { get @@ -226,7 +226,7 @@ /// The degree of space (in points) between /// the characters in a string of text. /// - [XmlAttributeAttribute("kerning")] + [XmlAttribute("kerning")] public int Kerning { get @@ -241,7 +241,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool KerningSpecified { get @@ -257,7 +257,7 @@ /// /// /// - [XmlAttributeAttribute("textColour")] + [XmlAttribute("textColour")] public PageXmlColourSimpleType TextColour { get @@ -272,7 +272,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TextColourSpecified { get @@ -289,7 +289,7 @@ /// Text colour in RGB encoded format /// (red value) + (256 x green value) + (65536 x blue value). /// - [XmlAttributeAttribute("textColourRgb", DataType = "integer")] + [XmlAttribute("textColourRgb", DataType = "integer")] public string TextColourRgb { get @@ -305,7 +305,7 @@ /// /// Background colour /// - [XmlAttributeAttribute("bgColour")] + [XmlAttribute("bgColour")] public PageXmlColourSimpleType BgColour { get @@ -320,7 +320,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool BgColourSpecified { get @@ -337,7 +337,7 @@ /// Background colour in RGB encoded format /// (red value) + (256 x green value) + (65536 x blue value). /// - [XmlAttributeAttribute("bgColourRgb", DataType = "integer")] + [XmlAttribute("bgColourRgb", DataType = "integer")] public string BgColourRgb { get @@ -354,7 +354,7 @@ /// Specifies whether the colour of the text appears /// reversed against a background colour. /// - [XmlAttributeAttribute("reverseVideo")] + [XmlAttribute("reverseVideo")] public bool ReverseVideo { get @@ -369,7 +369,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ReverseVideoSpecified { get @@ -383,7 +383,7 @@ } /// - [XmlAttributeAttribute("bold")] + [XmlAttribute("bold")] public bool Bold { get @@ -398,7 +398,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool BoldSpecified { get @@ -412,7 +412,7 @@ } /// - [XmlAttributeAttribute("italic")] + [XmlAttribute("italic")] public bool Italic { get @@ -427,7 +427,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ItalicSpecified { get @@ -441,7 +441,7 @@ } /// - [XmlAttributeAttribute("underlined")] + [XmlAttribute("underlined")] public bool Underlined { get @@ -456,7 +456,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool UnderlinedSpecified { get @@ -472,7 +472,7 @@ /// /// Line style details if "underlined" is TRUE /// - [XmlAttributeAttribute("underlineStyle")] + [XmlAttribute("underlineStyle")] public PageXmlUnderlineStyleSimpleType UnderlineStyle { get @@ -487,7 +487,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool UnderlineStyleSpecified { get @@ -501,7 +501,7 @@ } /// - [XmlAttributeAttribute("subscript")] + [XmlAttribute("subscript")] public bool Subscript { get @@ -516,7 +516,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SubscriptSpecified { get @@ -530,7 +530,7 @@ } /// - [XmlAttributeAttribute("superscript")] + [XmlAttribute("superscript")] public bool Superscript { get @@ -545,7 +545,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SuperscriptSpecified { get @@ -559,7 +559,7 @@ } /// - [XmlAttributeAttribute("strikethrough")] + [XmlAttribute("strikethrough")] public bool Strikethrough { get @@ -574,7 +574,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool StrikethroughSpecified { get @@ -588,7 +588,7 @@ } /// - [XmlAttributeAttribute("smallCaps")] + [XmlAttribute("smallCaps")] public bool SmallCaps { get @@ -603,7 +603,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SmallCapsSpecified { get @@ -617,7 +617,7 @@ } /// - [XmlAttributeAttribute("letterSpaced")] + [XmlAttribute("letterSpaced")] public bool LetterSpaced { get @@ -632,7 +632,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool LetterSpacedSpecified { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnderlineStyleSimpleType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnderlineStyleSimpleType.cs similarity index 57% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnderlineStyleSimpleType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnderlineStyleSimpleType.cs index 4efeaca6..9dd9a7e2 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnderlineStyleSimpleType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnderlineStyleSimpleType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,22 +9,22 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlUnderlineStyleSimpleType { /// - [XmlEnumAttribute("singleLine")] + [XmlEnum("singleLine")] SingleLine, /// - [XmlEnumAttribute("doubleLine")] + [XmlEnum("doubleLine")] DoubleLine, /// - [XmlEnumAttribute("other")] + [XmlEnum("other")] Other, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnknownRegion.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnknownRegion.cs similarity index 59% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnknownRegion.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnknownRegion.cs index 88b69d5f..6f701fb5 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnknownRegion.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnknownRegion.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// To be used if the region type cannot be ascertained. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlUnknownRegion : PageXmlRegion { } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroup.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroup.cs similarity index 82% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroup.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroup.cs index 69b45b93..eddbedad 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroup.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroup.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Numbered group (contains unordered elements) /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlUnorderedGroup { #region private @@ -46,7 +46,7 @@ #endregion /// - [XmlArrayItemAttribute("UserAttribute", IsNullable = false)] + [XmlArrayItem("UserAttribute", IsNullable = false)] public PageXmlUserAttribute[] UserDefined { get @@ -62,7 +62,7 @@ /// /// Semantic labels / tags /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -76,9 +76,9 @@ } /// - [XmlElementAttribute("OrderedGroup", typeof(PageXmlOrderedGroup))] - [XmlElementAttribute("RegionRef", typeof(PageXmlRegionRef))] - [XmlElementAttribute("UnorderedGroup", typeof(PageXmlUnorderedGroup))] + [XmlElement("OrderedGroup", typeof(PageXmlOrderedGroup))] + [XmlElement("RegionRef", typeof(PageXmlRegionRef))] + [XmlElement("UnorderedGroup", typeof(PageXmlUnorderedGroup))] public object[] Items { get @@ -92,7 +92,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -110,7 +110,7 @@ /// The parent region doubles as reading order group. /// Only the nested regions should be allowed as group members. /// - [XmlAttributeAttribute("regionRef", DataType = "IDREF")] + [XmlAttribute("regionRef", DataType = "IDREF")] public string RegionRef { get @@ -124,7 +124,7 @@ } /// - [XmlAttributeAttribute("caption")] + [XmlAttribute("caption")] public string Caption { get @@ -138,7 +138,7 @@ } /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlGroupSimpleType Type { get @@ -153,7 +153,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -170,7 +170,7 @@ /// Is this group a continuation of another group /// (from previous column or page, for example)? /// - [XmlAttributeAttribute("continuation")] + [XmlAttribute("continuation")] public bool Continuation { get @@ -185,7 +185,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ContinuationSpecified { get @@ -201,7 +201,7 @@ /// /// For generic use /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -215,7 +215,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroupIndexed.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroupIndexed.cs similarity index 83% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroupIndexed.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroupIndexed.cs index b469b831..519e0b6b 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroupIndexed.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUnorderedGroupIndexed.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Indexed group containing ordered elements /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlUnorderedGroupIndexed { #region private @@ -48,7 +48,7 @@ #endregion /// - [XmlArrayItemAttribute("UserAttribute", IsNullable = false)] + [XmlArrayItem("UserAttribute", IsNullable = false)] public PageXmlUserAttribute[] UserDefined { get @@ -64,7 +64,7 @@ /// /// Semantic labels / tags /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -78,9 +78,9 @@ } /// - [XmlElementAttribute("OrderedGroup", typeof(PageXmlOrderedGroup))] - [XmlElementAttribute("RegionRef", typeof(PageXmlRegionRef))] - [XmlElementAttribute("UnorderedGroup", typeof(PageXmlUnorderedGroup))] + [XmlElement("OrderedGroup", typeof(PageXmlOrderedGroup))] + [XmlElement("RegionRef", typeof(PageXmlRegionRef))] + [XmlElement("UnorderedGroup", typeof(PageXmlUnorderedGroup))] public object[] Items { get @@ -94,7 +94,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -112,7 +112,7 @@ /// The parent region doubles as reading order group. /// Only the nested regions should be allowed as group members. /// - [XmlAttributeAttribute("regionRef", DataType = "IDREF")] + [XmlAttribute("regionRef", DataType = "IDREF")] public string RegionRef { get @@ -128,7 +128,7 @@ /// /// Position (order number) of this item within the current hierarchy level. /// - [XmlAttributeAttribute("index")] + [XmlAttribute("index")] public int Index { get @@ -142,7 +142,7 @@ } /// - [XmlAttributeAttribute("caption")] + [XmlAttribute("caption")] public string Caption { get @@ -156,7 +156,7 @@ } /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlGroupSimpleType Type { get @@ -171,7 +171,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -188,7 +188,7 @@ /// Is this group a continuation of another group (from /// previous column or page, for example)? /// - [XmlAttributeAttribute("continuation")] + [XmlAttribute("continuation")] public bool Continuation { get @@ -203,7 +203,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ContinuationSpecified { get @@ -219,7 +219,7 @@ /// /// For generic use /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -233,7 +233,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUserAttribute.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUserAttribute.cs similarity index 80% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUserAttribute.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUserAttribute.cs index 1db60808..9c512a92 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUserAttribute.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUserAttribute.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -12,11 +12,11 @@ /// Structured custom data defined by name, type and value. /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlUserAttribute { @@ -31,7 +31,7 @@ private string valueField; /// - [XmlAttributeAttribute("name")] + [XmlAttribute("name")] public string Name { get @@ -45,7 +45,7 @@ } /// - [XmlAttributeAttribute("description")] + [XmlAttribute("description")] public string Description { get @@ -59,7 +59,7 @@ } /// - [XmlAttributeAttribute("type")] + [XmlAttribute("type")] public PageXmlUserAttributeType Type { get @@ -74,7 +74,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool TypeSpecified { get @@ -88,7 +88,7 @@ } /// - [XmlAttributeAttribute("value")] + [XmlAttribute("value")] public string Value { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUserAttributeType.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUserAttributeType.cs similarity index 55% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUserAttributeType.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUserAttributeType.cs index 22834321..67177692 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlUserAttributeType.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlUserAttributeType.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -9,26 +9,26 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [XmlTypeAttribute(AnonymousType = true, Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [XmlType(AnonymousType = true, Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public enum PageXmlUserAttributeType { /// - [XmlEnumAttribute("xsd:string")] + [XmlEnum("xsd:string")] XsdString, /// - [XmlEnumAttribute("xsd:integer")] + [XmlEnum("xsd:integer")] XsdInteger, /// - [XmlEnumAttribute("xsd:boolean")] + [XmlEnum("xsd:boolean")] XsdBoolean, /// - [XmlEnumAttribute("xsd:float")] + [XmlEnum("xsd:float")] XsdFloat, } } diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlWord.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlWord.cs similarity index 88% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlWord.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlWord.cs index 349e6f12..15dab5fe 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.PageXmlWord.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.PageXmlWord.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -11,11 +11,11 @@ { /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] public class PageXmlWord { #region private @@ -63,7 +63,7 @@ /// /// Alternative word images (e.g. black-and-white) /// - [XmlElementAttribute("AlternativeImage")] + [XmlElement("AlternativeImage")] public PageXmlAlternativeImage[] AlternativeImages { get @@ -90,7 +90,7 @@ } /// - [XmlElementAttribute("Glyph")] + [XmlElement("Glyph")] public PageXmlGlyph[] Glyphs { get @@ -104,7 +104,7 @@ } /// - [XmlElementAttribute("TextEquiv")] + [XmlElement("TextEquiv")] public PageXmlTextEquiv[] TextEquivs { get @@ -131,7 +131,7 @@ } /// - [XmlArrayItemAttribute("UserAttribute", IsNullable = false)] + [XmlArrayItem("UserAttribute", IsNullable = false)] public PageXmlUserAttribute[] UserDefined { get @@ -147,7 +147,7 @@ /// /// Semantic labels / tags /// - [XmlElementAttribute("Labels")] + [XmlElement("Labels")] public PageXmlLabels[] Labels { get @@ -161,7 +161,7 @@ } /// - [XmlAttributeAttribute("id", DataType = "ID")] + [XmlAttribute("id", DataType = "ID")] public string Id { get @@ -177,7 +177,7 @@ /// /// Overrides primaryLanguage attribute of parent line and/or text region /// - [XmlAttributeAttribute("language")] + [XmlAttribute("language")] public PageXmlLanguageSimpleType Language { get @@ -192,7 +192,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool LanguageSpecified { get @@ -208,7 +208,7 @@ /// /// The primary script used in the word /// - [XmlAttributeAttribute("primaryScript")] + [XmlAttribute("primaryScript")] public PageXmlScriptSimpleType PrimaryScript { get @@ -223,7 +223,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool PrimaryScriptSpecified { get @@ -239,7 +239,7 @@ /// /// The secondary script used in the word /// - [XmlAttributeAttribute("secondaryScript")] + [XmlAttribute("secondaryScript")] public PageXmlScriptSimpleType SecondaryScript { get @@ -254,7 +254,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool SecondaryScriptSpecified { get @@ -270,7 +270,7 @@ /// /// The direction in which text within the word should be read(order of characters). /// - [XmlAttributeAttribute("readingDirection")] + [XmlAttribute("readingDirection")] public PageXmlReadingDirectionSimpleType ReadingDirection { get @@ -285,7 +285,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ReadingDirectionSpecified { get @@ -301,7 +301,7 @@ /// /// Overrides the production attribute of the parent text line and/or text region. /// - [XmlAttributeAttribute("production")] + [XmlAttribute("production")] public PageXmlProductionSimpleType Production { get @@ -316,7 +316,7 @@ } /// - [XmlIgnoreAttribute()] + [XmlIgnore()] public bool ProductionSpecified { get @@ -332,7 +332,7 @@ /// /// For generic use /// - [XmlAttributeAttribute("custom")] + [XmlAttribute("custom")] public string Custom { get @@ -346,7 +346,7 @@ } /// - [XmlAttributeAttribute("comments")] + [XmlAttribute("comments")] public string Comments { get diff --git a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.cs similarity index 76% rename from src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.cs index ef08dd83..6e90f9ec 100644 --- a/src/UglyToad.PdfPig/Export/PAGE/PageXmlDocument.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PAGE/PageXmlDocument.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export.PAGE +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export.PAGE { using System; using System.CodeDom.Compiler; @@ -16,12 +16,12 @@ /// Version 2019-07-15 /// [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [SerializableAttribute()] - [DebuggerStepThroughAttribute()] - [DesignerCategoryAttribute("code")] - [XmlTypeAttribute(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] - [XmlRootAttribute("PcGts", Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15", IsNullable = false)] + [GeneratedCode("xsd", "4.6.1055.0")] + [Serializable()] + [DebuggerStepThrough()] + [DesignerCategory("code")] + [XmlType(Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15")] + [XmlRoot("PcGts", Namespace = "http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15", IsNullable = false)] public partial class PageXmlDocument { private PageXmlMetadata metadataField; @@ -57,7 +57,7 @@ } /// - [XmlAttributeAttribute("pcGtsId", DataType = "ID")] + [XmlAttribute("pcGtsId", DataType = "ID")] public string PcGtsId { get diff --git a/src/UglyToad.PdfPig/Export/PageXmlTextExporter.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PageXmlTextExporter.cs similarity index 99% rename from src/UglyToad.PdfPig/Export/PageXmlTextExporter.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PageXmlTextExporter.cs index 7efa6395..4572517d 100644 --- a/src/UglyToad.PdfPig/Export/PageXmlTextExporter.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/Export/PageXmlTextExporter.cs @@ -1,4 +1,4 @@ -namespace UglyToad.PdfPig.Export +namespace UglyToad.PdfPig.DocumentLayoutAnalysis.Export { using System; using System.Collections.Generic; @@ -8,9 +8,9 @@ using Content; using Core; using DocumentLayoutAnalysis; - using PAGE; using Geometry; using Graphics.Colors; + using PAGE; using Util; /// diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/IPageSegmenter.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/IPageSegmenter.cs similarity index 84% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/IPageSegmenter.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/IPageSegmenter.cs index 27511786..d4c02223 100644 --- a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/IPageSegmenter.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/IPageSegmenter.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; -using UglyToad.PdfPig.Content; - -namespace UglyToad.PdfPig.DocumentLayoutAnalysis +namespace UglyToad.PdfPig.DocumentLayoutAnalysis { + using System.Collections.Generic; + using Content; + /// /// Page segmentation divides a page into areas, each consisting of a layout structure (blocks, lines, etc.). /// See 'Performance Comparison of Six Algorithms for Page Segmentation' by Faisal Shafait, Daniel Keysers, and Thomas M. Breuel. diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/MathExtensions.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/MathExtensions.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/MathExtensions.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/MathExtensions.cs diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/NearestNeighbourWordExtractor.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/NearestNeighbourWordExtractor.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/NearestNeighbourWordExtractor.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/NearestNeighbourWordExtractor.cs diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/RecursiveXYCut.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/RecursiveXYCut.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/RecursiveXYCut.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/RecursiveXYCut.cs diff --git a/src/UglyToad.PdfPig/Content/TextBlock.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/TextBlock.cs similarity index 96% rename from src/UglyToad.PdfPig/Content/TextBlock.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/TextBlock.cs index e0a9b9f6..04808b87 100644 --- a/src/UglyToad.PdfPig/Content/TextBlock.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/TextBlock.cs @@ -1,8 +1,9 @@ -namespace UglyToad.PdfPig.Content +namespace UglyToad.PdfPig.DocumentLayoutAnalysis { using System; using System.Collections.Generic; using System.Linq; + using Content; using Core; /// diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/TextEdgesExtractor.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/TextEdgesExtractor.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/TextEdgesExtractor.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/TextEdgesExtractor.cs diff --git a/src/UglyToad.PdfPig/Content/TextLine.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/TextLine.cs similarity index 96% rename from src/UglyToad.PdfPig/Content/TextLine.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/TextLine.cs index 94d19f12..7a4b4ada 100644 --- a/src/UglyToad.PdfPig/Content/TextLine.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/TextLine.cs @@ -1,8 +1,9 @@ -namespace UglyToad.PdfPig.Content +namespace UglyToad.PdfPig.DocumentLayoutAnalysis { using System; using System.Collections.Generic; using System.Linq; + using Content; using Core; /// diff --git a/src/UglyToad.PdfPig.DocumentLayoutAnalysis/UglyToad.PdfPig.DocumentLayoutAnalysis.csproj b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/UglyToad.PdfPig.DocumentLayoutAnalysis.csproj new file mode 100644 index 00000000..6aa0c4c3 --- /dev/null +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/UglyToad.PdfPig.DocumentLayoutAnalysis.csproj @@ -0,0 +1,23 @@ + + + + netstandard2.0;net45;net451;net452;net46;net461;net462;net47 + latest + + + + true + + obj\Debug\netstandard2.0\UglyToad.PdfPig.DocumentLayoutAnalysis.xml + + + + + + + + + + + + \ No newline at end of file diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/WhitespaceCoverExtractor.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/WhitespaceCoverExtractor.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/WhitespaceCoverExtractor.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/WhitespaceCoverExtractor.cs index b518a360..62068f33 100644 --- a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/WhitespaceCoverExtractor.cs +++ b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/WhitespaceCoverExtractor.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; using System.Linq; - using Core; using Content; + using Core; using Geometry; /// diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/XYLeaf.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/XYLeaf.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/XYLeaf.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/XYLeaf.cs diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/XYNode.cs b/src/UglyToad.PdfPig.DocumentLayoutAnalysis/XYNode.cs similarity index 100% rename from src/UglyToad.PdfPig/DocumentLayoutAnalysis/XYNode.cs rename to src/UglyToad.PdfPig.DocumentLayoutAnalysis/XYNode.cs diff --git a/src/UglyToad.PdfPig.Tests/Integration/PigProductionHandbookTests.cs b/src/UglyToad.PdfPig.Tests/Integration/PigProductionHandbookTests.cs index 89bfba83..efb3f750 100644 --- a/src/UglyToad.PdfPig.Tests/Integration/PigProductionHandbookTests.cs +++ b/src/UglyToad.PdfPig.Tests/Integration/PigProductionHandbookTests.cs @@ -4,11 +4,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; - using System.Text; - using System.Xml; - using System.Xml.Linq; - using DocumentLayoutAnalysis; - using Export; using Xunit; public class PigProductionHandbookTests @@ -134,41 +129,6 @@ } } - [Fact] - public void CanExportAltoXmlFormat() - { - using (var document = PdfDocument.Open(GetFilename(), ParsingOptions.LenientParsingOff)) - { - var exporter = new AltoXmlTextExporter(new NearestNeighbourWordExtractor(), new DocstrumBoundingBoxes()); - var xml = exporter.Get(document.GetPage(4), true); - Assert.NotNull(xml); - using (var xmlStream = new MemoryStream(Encoding.UTF8.GetBytes(xml))) - using (var xmlReader = new XmlTextReader(xmlStream)) - { - var xDocument = XDocument.Load(xmlReader); - Assert.NotNull(xDocument); - } - } - } - - [Fact] - public void CanExportAltoXmlFormatPage16() - { - // Page 16 contains an unprintable string and a single line of text which causes problems for Docstrum. - using (var document = PdfDocument.Open(GetFilename(), ParsingOptions.LenientParsingOff)) - { - var exporter = new AltoXmlTextExporter(new NearestNeighbourWordExtractor(), new DocstrumBoundingBoxes()); - var xml = exporter.Get(document.GetPage(16), true); - Assert.NotNull(xml); - using (var xmlStream = new MemoryStream(Encoding.UTF8.GetBytes(xml))) - using (var xmlReader = new XmlTextReader(xmlStream)) - { - var xDocument = XDocument.Load(xmlReader); - Assert.NotNull(xDocument); - } - } - } - [Fact] public void LettersHaveCorrectPosition() { diff --git a/src/UglyToad.PdfPig.Tests/PublicApiScannerTests.cs b/src/UglyToad.PdfPig.Tests/PublicApiScannerTests.cs index ef1e3557..ecc0d131 100644 --- a/src/UglyToad.PdfPig.Tests/PublicApiScannerTests.cs +++ b/src/UglyToad.PdfPig.Tests/PublicApiScannerTests.cs @@ -9,7 +9,7 @@ public class PublicApiScannerTests { - // [Fact] + [Fact] public void OnlyExposedApiIsPublic() { var assembly = typeof(PdfDocument).Assembly; @@ -76,47 +76,19 @@ "UglyToad.PdfPig.Content.PageSize", "UglyToad.PdfPig.Content.PageTreeNode", "UglyToad.PdfPig.Content.Word", - "UglyToad.PdfPig.Content.TextLine", - "UglyToad.PdfPig.Content.TextBlock", "UglyToad.PdfPig.Content.TextDirection", "UglyToad.PdfPig.Content.XmpMetadata", - "UglyToad.PdfPig.Core.TransformationMatrix", "UglyToad.PdfPig.CrossReference.CrossReferenceTable", "UglyToad.PdfPig.CrossReference.CrossReferenceType", "UglyToad.PdfPig.CrossReference.TrailerDictionary", - "UglyToad.PdfPig.DocumentLayoutAnalysis.Distances", - "UglyToad.PdfPig.DocumentLayoutAnalysis.DocstrumBoundingBoxes", - "UglyToad.PdfPig.DocumentLayoutAnalysis.DecorationTextBlockClassifier", - "UglyToad.PdfPig.DocumentLayoutAnalysis.DefaultPageSegmenter", - "UglyToad.PdfPig.DocumentLayoutAnalysis.IPageSegmenter", - "UglyToad.PdfPig.DocumentLayoutAnalysis.MathExtensions", - "UglyToad.PdfPig.DocumentLayoutAnalysis.NearestNeighbourWordExtractor", - "UglyToad.PdfPig.DocumentLayoutAnalysis.RecursiveXYCut", - "UglyToad.PdfPig.DocumentLayoutAnalysis.TextEdgesExtractor", - "UglyToad.PdfPig.DocumentLayoutAnalysis.EdgeType", - "UglyToad.PdfPig.DocumentLayoutAnalysis.WhitespaceCoverExtractor", "UglyToad.PdfPig.Exceptions.PdfDocumentEncryptedException", - "UglyToad.PdfPig.Exceptions.PdfDocumentFormatException", - "UglyToad.PdfPig.Export.AltoXmlTextExporter", - "UglyToad.PdfPig.Export.HOcrTextExporter", - "UglyToad.PdfPig.Export.ITextExporter", - "UglyToad.PdfPig.Export.PageXmlTextExporter", - "UglyToad.PdfPig.Export.Alto.AltoDocument", - "UglyToad.PdfPig.Export.PAGE.PageXmlDocument", - "UglyToad.PdfPig.Fonts.DescriptorFontFile", - "UglyToad.PdfPig.Fonts.Exceptions.InvalidFontFormatException", - "UglyToad.PdfPig.Fonts.FontDescriptor", - "UglyToad.PdfPig.Fonts.FontDescriptorFlags", - "UglyToad.PdfPig.Fonts.FontStretch", - "UglyToad.PdfPig.Fonts.Standard14Font", - "UglyToad.PdfPig.Fonts.TrueType.Tables.IndexToLocationTable", - "UglyToad.PdfPig.Fonts.TrueType.Tables.ITrueTypeTable", - "UglyToad.PdfPig.Fonts.TrueType.TrueTypeHeaderTable", + "UglyToad.PdfPig.PdfFonts.DescriptorFontFile", + "UglyToad.PdfPig.PdfFonts.FontDescriptor", + "UglyToad.PdfPig.PdfFonts.FontDescriptorFlags", + "UglyToad.PdfPig.PdfFonts.FontStretch", "UglyToad.PdfPig.Geometry.GeometryExtensions", "UglyToad.PdfPig.Geometry.PdfPath", - "UglyToad.PdfPig.Geometry.PdfPoint", "UglyToad.PdfPig.Geometry.PdfLine", - "UglyToad.PdfPig.Geometry.PdfRectangle", "UglyToad.PdfPig.Graphics.Colors.CMYKColor", "UglyToad.PdfPig.Graphics.Colors.ColorSpace", "UglyToad.PdfPig.Graphics.Colors.ColorSpaceExtensions", @@ -209,7 +181,6 @@ "UglyToad.PdfPig.Graphics.Operations.TextState.Type3SetGlyphWidthAndBoundingBox", "UglyToad.PdfPig.Graphics.TextMatrices", "UglyToad.PdfPig.IndirectReference", - "UglyToad.PdfPig.IO.IInputBytes", "UglyToad.PdfPig.Logging.ILog", "UglyToad.PdfPig.Outline.Bookmarks", "UglyToad.PdfPig.Outline.BookmarkNode", diff --git a/src/UglyToad.PdfPig.sln b/src/UglyToad.PdfPig.sln index a5c44769..d085bd1b 100644 --- a/src/UglyToad.PdfPig.sln +++ b/src/UglyToad.PdfPig.sln @@ -12,9 +12,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UglyToad.PdfPig.Fonts", "UglyToad.PdfPig.Fonts\UglyToad.PdfPig.Fonts.csproj", "{BBC8F94C-6E94-43FF-AB2E-47FF3C2B999F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UglyToad.PdfPig.Fonts", "UglyToad.PdfPig.Fonts\UglyToad.PdfPig.Fonts.csproj", "{BBC8F94C-6E94-43FF-AB2E-47FF3C2B999F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UglyToad.PdfPig.Core", "UglyToad.PdfPig.Core\UglyToad.PdfPig.Core.csproj", "{A7E1DD9F-92B7-4061-9BA5-6E06C06175F9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UglyToad.PdfPig.Core", "UglyToad.PdfPig.Core\UglyToad.PdfPig.Core.csproj", "{A7E1DD9F-92B7-4061-9BA5-6E06C06175F9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UglyToad.PdfPig.DocumentLayoutAnalysis", "UglyToad.PdfPig.DocumentLayoutAnalysis\UglyToad.PdfPig.DocumentLayoutAnalysis.csproj", "{60126BCA-6C52-48A9-A0A6-51796C8B0BE7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -38,6 +40,10 @@ Global {A7E1DD9F-92B7-4061-9BA5-6E06C06175F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7E1DD9F-92B7-4061-9BA5-6E06C06175F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7E1DD9F-92B7-4061-9BA5-6E06C06175F9}.Release|Any CPU.Build.0 = Release|Any CPU + {60126BCA-6C52-48A9-A0A6-51796C8B0BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {60126BCA-6C52-48A9-A0A6-51796C8B0BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60126BCA-6C52-48A9-A0A6-51796C8B0BE7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {60126BCA-6C52-48A9-A0A6-51796C8B0BE7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/UglyToad.PdfPig/PdfFonts/CharacterWidth.cs b/src/UglyToad.PdfPig/PdfFonts/CharacterWidth.cs deleted file mode 100644 index 47247290..00000000 --- a/src/UglyToad.PdfPig/PdfFonts/CharacterWidth.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace UglyToad.PdfPig.PdfFonts -{ - /// - /// The x and y components of the width vector of the font's characters. - /// Presence implies that IsFixedPitch is true. - /// - internal class CharacterWidth - { - public double X { get; } - - public double Y { get; } - - public CharacterWidth(double x, double y) - { - X = x; - Y = y; - } - } -} \ No newline at end of file diff --git a/src/UglyToad.PdfPig/PdfFonts/TrueType/PdfCidTrueTypeFont.cs b/src/UglyToad.PdfPig/PdfFonts/CidFonts/PdfCidTrueTypeFont.cs similarity index 94% rename from src/UglyToad.PdfPig/PdfFonts/TrueType/PdfCidTrueTypeFont.cs rename to src/UglyToad.PdfPig/PdfFonts/CidFonts/PdfCidTrueTypeFont.cs index fab09b6c..ec38d4bb 100644 --- a/src/UglyToad.PdfPig/PdfFonts/TrueType/PdfCidTrueTypeFont.cs +++ b/src/UglyToad.PdfPig/PdfFonts/CidFonts/PdfCidTrueTypeFont.cs @@ -1,7 +1,6 @@ -namespace UglyToad.PdfPig.PdfFonts.TrueType +namespace UglyToad.PdfPig.PdfFonts.CidFonts { using System; - using CidFonts; using Core; using Fonts.TrueType; diff --git a/src/UglyToad.PdfPig/PdfFonts/Parser/Parts/CidFontFactory.cs b/src/UglyToad.PdfPig/PdfFonts/Parser/Parts/CidFontFactory.cs index c797ed81..1e2e7ae9 100644 --- a/src/UglyToad.PdfPig/PdfFonts/Parser/Parts/CidFontFactory.cs +++ b/src/UglyToad.PdfPig/PdfFonts/Parser/Parts/CidFontFactory.cs @@ -13,7 +13,6 @@ using PdfPig.Parser.Parts; using Tokenization.Scanner; using Tokens; - using TrueType; using Util; internal class CidFontFactory diff --git a/src/UglyToad.PdfPig/PdfFonts/Type1/Type1FontProgram.cs b/src/UglyToad.PdfPig/PdfFonts/Type1/Type1FontProgram.cs index 646aa51a..af4fcc0c 100644 --- a/src/UglyToad.PdfPig/PdfFonts/Type1/Type1FontProgram.cs +++ b/src/UglyToad.PdfPig/PdfFonts/Type1/Type1FontProgram.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using CharStrings; using Core; - using Geometry; using Tokens; using Util.JetBrains.Annotations; diff --git a/src/UglyToad.PdfPig/UglyToad.PdfPig.csproj b/src/UglyToad.PdfPig/UglyToad.PdfPig.csproj index 09338c8f..be3ec3ab 100644 --- a/src/UglyToad.PdfPig/UglyToad.PdfPig.csproj +++ b/src/UglyToad.PdfPig/UglyToad.PdfPig.csproj @@ -53,5 +53,9 @@ + + + +