[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev, master: patch fontloader files fix #124 (41b0853)

Wed May 6 23:10:26 CEST 2020

Repository : https://github.com/latex3/luaotfload
On branches: dev,master
Link       : https://github.com/latex3/luaotfload/commit/41b0853d910029064f7a8f39b0d87739504d3895

>---------------------------------------------------------------

commit 41b0853d910029064f7a8f39b0d87739504d3895
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Wed May 6 23:10:26 2020 +0200

    patch fontloader files fix #124


>---------------------------------------------------------------

41b0853d910029064f7a8f39b0d87739504d3895
 ...er-2020-04-30.lua => fontloader-2020-05-06.lua} |   0
 src/fontloader/misc/fontloader-font-ocl.lua        |   2 +-
 src/fontloader/runtime/fontloader-reference.lua    |   1 +
 testfiles/colr-restore.pvt                         |  10 ++
 .../{issue109-tounicode.tpf => colr-restore.tpf}   | 113 ++++++++++++++-------
 5 files changed, 86 insertions(+), 40 deletions(-)

diff --git a/src/auto/fontloader-2020-04-30.lua b/src/auto/fontloader-2020-05-06.lua
similarity index 100%
rename from src/auto/fontloader-2020-04-30.lua
rename to src/auto/fontloader-2020-05-06.lua
diff --git a/src/fontloader/misc/fontloader-font-ocl.lua b/src/fontloader/misc/fontloader-font-ocl.lua
index f8b6577..094e8b8 100644
--- a/src/fontloader/misc/fontloader-font-ocl.lua
+++ b/src/fontloader/misc/fontloader-font-ocl.lua
@@ -5,7 +5,7 @@ if not modules then modules = { } end modules ['font-ocl'] = {
     copyright = "PRAGMA ADE / ConTeXt Development Team",
     license   = "see context related readme files"
 }
-
+-- patched version 2020-05-06 UF (colr/restorefix -- 
 -- todo : user list of colors
 
 if CONTEXTLMTXMODE and CONTEXTLMTXMODE > 0 then
diff --git a/src/fontloader/runtime/fontloader-reference.lua b/src/fontloader/runtime/fontloader-reference.lua
index 51fcfbe..9f381d3 100644
--- a/src/fontloader/runtime/fontloader-reference.lua
+++ b/src/fontloader/runtime/fontloader-reference.lua
@@ -1,6 +1,7 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
 -- merge date  : 2020-04-30 11:10
+-- patched on 2020-05-06 (colr-restore fix
 
 do -- begin closure to overcome local limits and interference
 
diff --git a/testfiles/colr-restore.pvt b/testfiles/colr-restore.pvt
new file mode 100644
index 0000000..c9e8771
--- /dev/null
+++ b/testfiles/colr-restore.pvt
@@ -0,0 +1,10 @@
+
+\input{regression-test}
+\documentclass{article}
+
+\font\fontB={file:BungeeColor1.ttf:mode=node;+colr;+ccmp;+dist;}
+\begin{document}
+\pdfextension save
+\pdfextension restore
+{\fontB ABC}
+\end{document}
\ No newline at end of file
diff --git a/testfiles/issue109-tounicode.tpf b/testfiles/colr-restore.tpf
similarity index 59%
copy from testfiles/issue109-tounicode.tpf
copy to testfiles/colr-restore.tpf
index 9250aba..98a8f43 100644
--- a/testfiles/issue109-tounicode.tpf
+++ b/testfiles/colr-restore.tpf
@@ -1,11 +1,46 @@
 %PDF-1.5
 %ÌÕÁÔÅØÐÄÆ
 3 0 obj
-<< /Length 139 >>        
+<< /Length 681 >>        
 stream
+1 0 0 1 133.768 717.088 cm
+q
+Q
+1 0 0 1 -133.768 -717.088 cm
+/Span << /ActualText <feff0041> >> BDC
+q
+0.788 0.035 0.000 rg
 BT
 /F26 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<00420043>-28<0044087408750876>]TJ
+1 0 0 1 148.712 707.125 Tm [<0124>]TJ
+1.000 0.584 0.502 rg
+1 0 0 1 148.712 707.125 Tm [<0125>]TJ
+ET
+Q
+EMC
+/Span << /ActualText <feff0042> >> BDC
+q
+0.788 0.035 0.000 rg
+BT
+/F26 9.96264 Tf
+1 0 0 1 155.985 707.125 Tm [<0138>]TJ
+1.000 0.584 0.502 rg
+1 0 0 1 155.985 707.125 Tm [<0139>]TJ
+ET
+Q
+EMC
+/Span << /ActualText <feff0043> >> BDC
+q
+0.788 0.035 0.000 rg
+BT
+/F26 9.96264 Tf
+1 0 0 1 163.208 707.125 Tm [<013A>]TJ
+1.000 0.584 0.502 rg
+1 0 0 1 163.208 707.125 Tm [<013B>]TJ
+ET
+Q
+EMC
+BT
 /F25 9.96264 Tf
 1 0 0 1 303.133 139.255 Tm [<0052>]TJ
 ET
@@ -74,27 +109,27 @@ endobj
 << /Type /Font /Subtype /CIDFontType0 /BaseFont /JFRMQG+LMRoman10-Regular /FontDescriptor 8 0 R /W 7 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
 endobj
 13 0 obj
-[ 66 [ 500 555 444 ] 2164 [ 500 500 500 ] ]
+[ 292 [ 730 730 ] 312 [ 725 725 628 628 ] ]
 endobj
 15 0 obj
-<< /Length 271 >>        
+<< /Length 40 >>         
 [BINARY STREAM]
 endobj
 16 0 obj
-<< /Subtype /CIDFontType0C /Length 1213 >>       
+<< /Length 6569 >>       
 [BINARY STREAM]
 endobj
 14 0 obj
-<< /Type /FontDescriptor /FontName /MNTVAL+CMUSerif-Roman /Flags 4 /FontBBox [ -1135 -387 1495 1094 ] /Ascent 935 /CapHeight 683 /Descent -250 /ItalicAngle 0 /StemV 93 /XHeight 430 /FontFile3 16 0 R /CIDSet 15 0 R >>
+<< /Type /FontDescriptor /FontName /PGGMUD+BungeeColor-Regular /Flags 4 /FontBBox [ 0 0 1000 720 ] /Ascent 720 /CapHeight 720 /Descent 0 /ItalicAngle 0 /StemV 86 /XHeight 500 /FontFile2 16 0 R /CIDSet 15 0 R >>
 endobj
 17 0 obj
-<< /Length 747 >>        
+<< /Length 772 >>        
 stream
 %!PS-Adobe-3.0 Resource-CMap
 %%DocumentNeededResources: ProcSet (CIDInit)
 %%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-MNTVAL-CMUSerif-Roman-0)
-%%Title: (TeX-MNTVAL-CMUSerif-Roman-0 TeX MNTVAL-CMUSerif-Roman 0)
+%%BeginResource: CMap (TeX-PGGMUD-BungeeColor-Regular-0)
+%%Title: (TeX-PGGMUD-BungeeColor-Regular-0 TeX PGGMUD-BungeeColor-Regular 0)
 %%Version: 1.000
 %%EndComments
 /CIDInit /ProcSet findresource begin
@@ -102,10 +137,10 @@ stream
 begincmap
 /CIDSystemInfo
 << /Registry (TeX)
-/Ordering (MNTVAL-CMUSerif-Roman)
+/Ordering (PGGMUD-BungeeColor-Regular)
 /Supplement 0
 >> def
-/CMapName /TeX-Identity-MNTVAL-CMUSerif-Roman def
+/CMapName /TeX-Identity-PGGMUD-BungeeColor-Regular def
 /CMapType 2 def
 1 begincodespacerange
 <0000> <FFFF>
@@ -113,12 +148,12 @@ endcodespacerange
 0 beginbfrange
 endbfrange
 6 beginbfchar
-<0042> <0061>
-<0043> <0062>
-<0044> <0063>
-<0874> <0031>
-<0875> <0032>
-<0876> <0033>
+<0124> <0061>
+<0125> <0061>
+<0138> <0062>
+<0139> <0062>
+<013A> <0063>
+<013B> <0063>
 endbfchar
 endcmap
 CMapName currentdict /CMap defineresource pop
@@ -129,10 +164,10 @@ end
 endstream
 endobj
 4 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /MNTVAL+CMUSerif-Roman /DescendantFonts [ 18 0 R ] /ToUnicode 17 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /PGGMUD+BungeeColor-Regular /DescendantFonts [ 18 0 R ] /ToUnicode 17 0 R >>
 endobj
 18 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /MNTVAL+CMUSerif-Roman /FontDescriptor 14 0 R /W 13 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /PGGMUD+BungeeColor-Regular /FontDescriptor 14 0 R /W 13 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
 endobj
 6 0 obj
 << /Type /Pages  /Count 1 /Kids [ 2 0 R ] >>
@@ -146,28 +181,28 @@ endobj
 xref
 0 21
 0000000000 65535 f 
-0000000331 00000 n 
-0000000218 00000 n 
+0000000873 00000 n 
+0000000760 00000 n 
 0000000020 00000 n 
-0000005233 00000 n 
-0000002154 00000 n 
-0000005580 00000 n 
-0000000410 00000 n 
-0000001168 00000 n 
-0000000440 00000 n 
-0000000510 00000 n 
-0000001402 00000 n 
-0000002307 00000 n 
-0000002505 00000 n 
-0000004193 00000 n 
-0000002565 00000 n 
-0000002896 00000 n 
-0000004426 00000 n 
-0000005383 00000 n 
-0000005640 00000 n 
-0000005690 00000 n 
+0000010895 00000 n 
+0000002696 00000 n 
+0000011275 00000 n 
+0000000952 00000 n 
+0000001710 00000 n 
+0000000982 00000 n 
+0000001052 00000 n 
+0000001944 00000 n 
+0000002849 00000 n 
+0000003047 00000 n 
+0000009836 00000 n 
+0000003107 00000 n 
+0000003207 00000 n 
+0000010063 00000 n 
+0000011050 00000 n 
+0000011335 00000 n 
+0000011385 00000 n 
 trailer
 << /Size 21 /Root 19 0 R /Info 20 0 R >>
 startxref
-5762
+11457
 %%EOF



