diff --git a/App/Functions/Editor/Controller.cs b/App/Functions/Editor/Controller.cs index 70be85c..4f9ec14 100644 --- a/App/Functions/Editor/Controller.cs +++ b/App/Functions/Editor/Controller.cs @@ -683,7 +683,7 @@ namespace PDFPatcher.Functions.Editor var h = pb.Height; var dh = pb.Y1 - h; var pt = pb.Y0; - foreach (var block in p.TextPage) { + foreach (var block in p.Text) { string jointBlockText = null; bool hasJointText = false; foreach (var line in block) { diff --git a/App/Functions/Editor/PagePropertyForm.cs b/App/Functions/Editor/PagePropertyForm.cs index 9a036c3..5e3bfcf 100644 --- a/App/Functions/Editor/PagePropertyForm.cs +++ b/App/Functions/Editor/PagePropertyForm.cs @@ -36,7 +36,7 @@ namespace PDFPatcher.Functions.Editor _PageDimensionBox.SelectedIndex = 0; } var ts = new HashSet(new FontAndSizeComparer()); - foreach (var block in page.TextPage) { + foreach (var block in page.Text) { foreach (var line in block) { var c = line.FirstCharacter; ts.Add(new MuFontAndSize(Model.PdfDocumentFont.RemoveSubsetPrefix(c.Font.Name), c.Size)); diff --git a/App/Functions/Editor/ViewerControl.cs b/App/Functions/Editor/ViewerControl.cs index 0e35138..8f4e5fd 100644 --- a/App/Functions/Editor/ViewerControl.cs +++ b/App/Functions/Editor/ViewerControl.cs @@ -723,11 +723,11 @@ internal sealed class ViewerControl : ImageBoxEx var page = _cache.LoadPage(position.Page); var point = position.ToPageCoordinate(page); if (!page.Bound.Contains(point) - || !page.TextPage.Bound.Contains(point)) { + || !page.Text.Bound.Contains(point)) { return ti; } - foreach (var block in page.TextPage) { + foreach (var block in page.Text) { if (block.Type == BlockType.Image || !block.Bound.Contains(point)) { continue; } @@ -789,10 +789,10 @@ internal sealed class ViewerControl : ImageBoxEx List r = null; var page = _cache.LoadPage(region.Page); var pr = region.ToPageCoordinate(page); - if (pr.Intersect(page.TextPage.Bound).IsEmpty) { + if (pr.Intersect(page.Text.Bound).IsEmpty) { return null; } - foreach (var block in page.TextPage) { + foreach (var block in page.Text) { if (block.Type == BlockType.Image || pr.Intersect(block.Bound).IsEmpty) { continue; } @@ -875,7 +875,7 @@ internal sealed class ViewerControl : ImageBoxEx Tracker.DebugMessage("render page " + pageNumber); bmp = p.RenderBitmapPage(width, height, _renderOptions, _cookie); _cache.SetBitmap(pageNumber, bmp); - _cache.SetTextPage(pageNumber, p.TextPage); + _cache.SetTextPage(pageNumber, p.Text); } } return bmp; diff --git a/App/Lib/MuPDFLib.dll b/App/Lib/MuPDFLib.dll index 4199c17..f0ac79d 100644 Binary files a/App/Lib/MuPDFLib.dll and b/App/Lib/MuPDFLib.dll differ