[latex3-commits] [latex3/pdfresources] etype-switch: change line ending (989f703)
github at latex-project.org
github at latex-project.org
Wed Nov 1 00:46:21 CET 2023
Repository : https://github.com/latex3/pdfresources
On branch : etype-switch
Link : https://github.com/latex3/pdfresources/commit/989f70303b7471195b9fcede6aab5b7dff0826e2
>---------------------------------------------------------------
commit 989f70303b7471195b9fcede6aab5b7dff0826e2
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Wed Nov 1 00:46:21 2023 +0100
change line ending
>---------------------------------------------------------------
989f70303b7471195b9fcede6aab5b7dff0826e2
testfiles-luatex/fontspec-spotcolor.pvt | 11 +-
testfiles-luatex/fontspec-spotcolor.tpf | 243 ++++++++++++++++++++++++--------
2 files changed, 197 insertions(+), 57 deletions(-)
diff --git a/testfiles-luatex/fontspec-spotcolor.pvt b/testfiles-luatex/fontspec-spotcolor.pvt
index b592191..1ec9164 100644
--- a/testfiles-luatex/fontspec-spotcolor.pvt
+++ b/testfiles-luatex/fontspec-spotcolor.pvt
@@ -12,9 +12,16 @@
}
\color_set:nnn{spotblue}{sepblue}{1}
\color_set:nnn{cmykblue}{cmyk}{1,1,1,0.5}
+% \__fontspec_keys_define_code:nnn {fontspec} {Color}
+% {
+% \tl_set:Nn \l__fontspec_hexcol_tl {#1}
+% }
\ExplSyntaxOff
+\definecolor{foo}{rgb}{0,0.75,0}
\setmainfont{texgyretermes}[Color=cmykblue]
-\setsansfont{texgyretermes}[Color=spotblue,Opacity=0.2]
+\setsansfont{texgyreheros}[Color=red,Opacity=0.2]
+\setmonofont{texgyrecursor}[Color=foo]
\begin{document}
-TTT \sffamily MMM
+TTT \sffamily MMM \ttfamily FFF} {\normalfont TTT} {\sffamily MMM} {\ttfamily
+FFF}
\end{document}
diff --git a/testfiles-luatex/fontspec-spotcolor.tpf b/testfiles-luatex/fontspec-spotcolor.tpf
index c2c6689..c86e166 100644
--- a/testfiles-luatex/fontspec-spotcolor.tpf
+++ b/testfiles-luatex/fontspec-spotcolor.tpf
@@ -227,7 +227,7 @@ stream
<xmpMM:DocumentID>uuid:d88cc665-cb12-4630-8d86-b8022c11f6ab</xmpMM:DocumentID>
<xmpMM:InstanceID>uuid:0a57c455-157a-4141-8c19-6237d832fc80</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
- <prism:pageCount>0</prism:pageCount>
+ <prism:pageCount>1</prism:pageCount>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
@@ -235,7 +235,7 @@ stream
endstream
endobj
10 0 obj
-<< /Length 409 >>
+<< /Length 834 >>
stream
/opacity1 gs
0 g 0 G
@@ -244,13 +244,31 @@ stream
1.0 1.0 1.0 0.5 k 1.0 1.0 1.0 0.5 K
BT
/F27 9.96264 Tf
-1 0 0 1 148.712 657.235 Tm [<003C003000330038>-250<0022001D002400630055001D003C>25<003300220049001D0063>15<006A0053>]TJ
+1 0 0 1 148.712 657.235 Tm [<006900690069>]TJ
0 g 0 G
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+/opacity0.196 gs
+/F48 9.96264 Tf
+1 0 0 1 169.464 657.235 Tm [<004B004B004B>]TJ
+0.5 0.75 0.5 rg 0.5 0.75 0.5 RG
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+/F49 9.96264 Tf
+1 0 0 1 196.852 657.235 Tm [<003700370037>]TJ
1.0 1.0 1.0 0.5 k 1.0 1.0 1.0 0.5 K
-1 0 0 1 148.712 645.28 Tm [<006900690069>]TJ
+/F27 9.96264 Tf
+1 0 0 1 217.275 657.235 Tm [<006900690069>]TJ
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+/opacity0.196 gs
+/F48 9.96264 Tf
+1 0 0 1 238.027 657.235 Tm [<004B004B004B>]TJ
+0.5 0.75 0.5 rg 0.5 0.75 0.5 RG
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+/F49 9.96264 Tf
+1 0 0 1 265.415 657.235 Tm [<003700370037>]TJ
0 g 0 G
0 g 0 G
1.0 1.0 1.0 0.5 k 1.0 1.0 1.0 0.5 K
+/F27 9.96264 Tf
1 0 0 1 303.133 89.365 Tm [<0053>]TJ
0 g 0 G
0 g 0 G
@@ -258,39 +276,151 @@ ET
endstream
endobj
9 0 obj
-<< /Type /Page /Contents 10 0 R /Resources 8 0 R /MediaBox [ 0 0 612 792 ] /Parent 12 0 R >>
+<< /Type /Page /Contents 10 0 R /Resources 8 0 R /MediaBox [ 0 0 612 792 ] /Parent 14 0 R >>
endobj
8 0 obj
-<< /ExtGState 1 0 R/ColorSpace 2 0 R /Font << /F27 11 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ExtGState 1 0 R/ColorSpace 2 0 R /Font << /F27 11 0 R /F48 12 0 R /F49 13 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1 0 obj
-<< /opacity1 <</ca 1/CA 1>> >>
+<< /opacity1 <</ca 1/CA 1>> /opacity0.196 <</ca 0.196/CA 0.196>> >>
endobj
2 0 obj
<< /color1 6 0 R >>
endobj
+15 0 obj
+[ 55 [ 600 ] ]
+endobj
+17 0 obj
+<< /Length 7 >>
+[BINARY STREAM]
+endobj
+18 0 obj
+<< /Subtype /CIDFontType0C /Length 660 >>
+[BINARY STREAM]
+endobj
+16 0 obj
+<< /Type /FontDescriptor /FontName /VHXSSO+TeXGyreCursor-Regular /Flags 4 /FontBBox [ -525 -250 1094 951 ] /Ascent 951 /CapHeight 563 /Descent -250 /ItalicAngle 0 /StemV 200 /XHeight 417 /FontFile3 18 0 R /CIDSet 17 0 R >>
+endobj
+19 0 obj
+<< /Length 712 >>
+stream
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-VHXSSO-TeXGyreCursor-Regular-0)
+%%Title: (TeX-VHXSSO-TeXGyreCursor-Regular-0 TeX VHXSSO-TeXGyreCursor-Regular 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (VHXSSO-TeXGyreCursor-Regular)
+/Supplement 0
+>> def
+/CMapName /TeX-Identity-VHXSSO-TeXGyreCursor-Regular def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+0 beginbfrange
+endbfrange
+1 beginbfchar
+<0037> <0046>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+endstream
+endobj
13 0 obj
-[ 29 [ 444 ] 34 [ 921 ] 36 [ 500 ] 48 [ 500 ] 51 [ 444 ] 56 [ 333 ] 60 [ 500 ] 73 [ 278 ] 83 [ 500 ] 85 [ 500 ] 99 [ 389 ] 105 [ 611 278 ] ]
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /VHXSSO+TeXGyreCursor-Regular /DescendantFonts [ 20 0 R ] /ToUnicode 19 0 R >>
endobj
-15 0 obj
+20 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /VHXSSO+TeXGyreCursor-Regular /FontDescriptor 16 0 R /W 15 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+endobj
+21 0 obj
+[ 75 [ 833 ] ]
+endobj
+23 0 obj
+<< /Length 10 >>
+[BINARY STREAM]
+endobj
+24 0 obj
+<< /Subtype /CIDFontType0C /Length 592 >>
+[BINARY STREAM]
+endobj
+22 0 obj
+<< /Type /FontDescriptor /FontName /UNIKPT+TeXGyreHeros-Regular /Flags 4 /FontBBox [ -529 -284 1353 1148 ] /Ascent 1148 /CapHeight 729 /Descent -284 /ItalicAngle 0 /StemV 93 /XHeight 524 /FontFile3 24 0 R /CIDSet 23 0 R >>
+endobj
+25 0 obj
+<< /Length 707 >>
+stream
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-UNIKPT-TeXGyreHeros-Regular-0)
+%%Title: (TeX-UNIKPT-TeXGyreHeros-Regular-0 TeX UNIKPT-TeXGyreHeros-Regular 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (UNIKPT-TeXGyreHeros-Regular)
+/Supplement 0
+>> def
+/CMapName /TeX-Identity-UNIKPT-TeXGyreHeros-Regular def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+0 beginbfrange
+endbfrange
+1 beginbfchar
+<004B> <004D>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+endstream
+endobj
+12 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /UNIKPT+TeXGyreHeros-Regular /DescendantFonts [ 26 0 R ] /ToUnicode 25 0 R >>
+endobj
+26 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /UNIKPT+TeXGyreHeros-Regular /FontDescriptor 22 0 R /W 21 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+endobj
+27 0 obj
+[ 83 [ 500 ] 105 [ 611 ] ]
+endobj
+29 0 obj
<< /Length 14 >>
[BINARY STREAM]
endobj
-16 0 obj
-<< /Subtype /CIDFontType0C /Length 2160 >>
+30 0 obj
+<< /Subtype /CIDFontType0C /Length 678 >>
[BINARY STREAM]
endobj
-14 0 obj
-<< /Type /FontDescriptor /FontName /YJAUCU+TeXGyreTermes-Regular /Flags 4 /FontBBox [ -526 -281 1306 1055 ] /Ascent 1055 /CapHeight 662 /Descent -281 /ItalicAngle 0 /StemV 83 /XHeight 450 /FontFile3 16 0 R /CIDSet 15 0 R >>
+28 0 obj
+<< /Type /FontDescriptor /FontName /VLATLF+TeXGyreTermes-Regular /Flags 4 /FontBBox [ -526 -281 1306 1055 ] /Ascent 1055 /CapHeight 662 /Descent -281 /ItalicAngle 0 /StemV 83 /XHeight 450 /FontFile3 30 0 R /CIDSet 29 0 R >>
endobj
-17 0 obj
-<< /Length 881 >>
+31 0 obj
+<< /Length 726 >>
stream
%!PS-Adobe-3.0 Resource-CMap
%%DocumentNeededResources: ProcSet (CIDInit)
%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-YJAUCU-TeXGyreTermes-Regular-0)
-%%Title: (TeX-YJAUCU-TeXGyreTermes-Regular-0 TeX YJAUCU-TeXGyreTermes-Regular 0)
+%%BeginResource: CMap (TeX-VLATLF-TeXGyreTermes-Regular-0)
+%%Title: (TeX-VLATLF-TeXGyreTermes-Regular-0 TeX VLATLF-TeXGyreTermes-Regular 0)
%%Version: 1.000
%%EndComments
/CIDInit /ProcSet findresource begin
@@ -298,30 +428,19 @@ stream
begincmap
/CIDSystemInfo
<< /Registry (TeX)
-/Ordering (YJAUCU-TeXGyreTermes-Regular)
+/Ordering (VLATLF-TeXGyreTermes-Regular)
/Supplement 0
>> def
-/CMapName /TeX-Identity-YJAUCU-TeXGyreTermes-Regular def
+/CMapName /TeX-Identity-VLATLF-TeXGyreTermes-Regular def
/CMapType 2 def
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
0 beginbfrange
endbfrange
-13 beginbfchar
-<001D> <0061>
-<0022> <0040>
-<0024> <0062>
-<0030> <0064>
-<0033> <0065>
-<0038> <0066>
-<003C> <0067>
-<0049> <006C>
+2 beginbfchar
<0053> <0031>
-<0055> <0070>
-<0063> <0073>
<0069> <0054>
-<006A> <0074>
endbfchar
endcmap
CMapName currentdict /CMap defineresource pop
@@ -332,45 +451,59 @@ end
endstream
endobj
11 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /YJAUCU+TeXGyreTermes-Regular /DescendantFonts [ 18 0 R ] /ToUnicode 17 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /VLATLF+TeXGyreTermes-Regular /DescendantFonts [ 32 0 R ] /ToUnicode 31 0 R >>
endobj
-18 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /YJAUCU+TeXGyreTermes-Regular /FontDescriptor 14 0 R /W 13 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+32 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /VLATLF+TeXGyreTermes-Regular /FontDescriptor 28 0 R /W 27 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-12 0 obj
+14 0 obj
<< /Type /Pages /Count 1 /Kids [ 9 0 R ] >>
endobj
-19 0 obj
-<< /Type /Catalog /Pages 12 0 R /Lang (en-US)/Metadata 7 0 R >>
+33 0 obj
+<< /Type /Catalog /Pages 14 0 R /Lang (en-US)/Metadata 7 0 R >>
endobj
-20 0 obj
+34 0 obj
<< /Producer (LuaTeX)/Creator (TeX)/CreationDate (D:20160520090000Z)/ModDate (D:20160520090000Z) /Trapped /False >>
endobj
xref
-0 21
+0 35
0000000003 65535 f
-0000012313 00000 n
-0000012360 00000 n
+0000012762 00000 n
+0000012846 00000 n
0000000004 00000 f
0000000000 00000 f
0000000020 00000 n
0000000104 00000 n
0000000172 00000 n
-0000012210 00000 n
-0000012102 00000 n
+0000012635 00000 n
+0000012527 00000 n
0000011633 00000 n
-0000016052 00000 n
-0000016414 00000 n
-0000012396 00000 n
-0000014871 00000 n
-0000012553 00000 n
-0000012627 00000 n
-0000015111 00000 n
-0000016210 00000 n
-0000016475 00000 n
-0000016555 00000 n
+0000019145 00000 n
+0000016880 00000 n
+0000014735 00000 n
+0000019507 00000 n
+0000012882 00000 n
+0000013724 00000 n
+0000012913 00000 n
+0000012980 00000 n
+0000013963 00000 n
+0000014893 00000 n
+0000015097 00000 n
+0000015874 00000 n
+0000015128 00000 n
+0000015198 00000 n
+0000016113 00000 n
+0000017037 00000 n
+0000017240 00000 n
+0000018119 00000 n
+0000017283 00000 n
+0000017357 00000 n
+0000018359 00000 n
+0000019303 00000 n
+0000019568 00000 n
+0000019648 00000 n
trailer
-<< /Size 21 /Root 19 0 R /Info 20 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
+<< /Size 35 /Root 33 0 R /Info 34 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-16687
+19780
%%EOF
More information about the latex3-commits
mailing list.