Dr. Werner Fink 2012-06-12 17:56:21 +00:00 committed by Git OBS Bridge
parent cdfaeec9af
commit 3e59c60e74
102 changed files with 19758 additions and 8299 deletions

3
collection-basic.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a926b2665a2ee844545fdc24f8a5f962871e6b39ce453c63f14f010738f128b7
size 588

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:290f241a66391f97d0f0342f00c714a58e4fadd7cdeb282a9f370d322aa13d4c
size 760

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c918aee7940bae61a42e9e759c055124e931a9a9360548b1b4466618610f4a6
size 716

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1dd7e2f84602fe2603b59cffe0440315f358317a5147a808d39a891e63adb697
size 532

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23057cdccb9337dfcad8b10f01eb3cc2d07c161d33c6a45becc54a3c46c96bcb
size 292

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a090634ac06af2039e1527d7b9e59cd7c4449fab2f42c6c921c50ff39d7dcae7
size 304

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b4a8d4764d44e9777db1585d720b543b4d9e52d01369652183372c5ae56127f
size 308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc4310567225b583a8d0e7061113613282a57e0fb65132d3668ea6180832fc8c
size 348

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e73543c7993eecc871064c5777cc5761dabc40f45b88fc01bf4586799fef44f6
size 308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2bc1842967819975b7997035d344b5013ff2e1cf78b30df7543150999d4b2c92
size 288

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c35ce8ab559cff04219ec1ac5c45c56b1301799f60cfd071cab5a9e54de127d1
size 716

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76682727f95a673b1ba72e730832a1858eb1058329806cbd1824a7b4f47c2fcb
size 288

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:822e9a9c0b743ff149b303a69fee43683559853cc93fd38e6f6d43c0d10c1603
size 368

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:add528ae1ad93a0ff6b561a4351dcb4f5528b915eee7383aec3590d64f2ee097
size 468

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5771bfb64313a63c59d52e130bbf3fed727f1b35662e9b7408445c459fe3b3ad
size 344

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e0d935513c855494b8e184e5a4dd8aa4d82349f3d5dcdb7204bccccd6de49a82
size 292

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7515b5e2f231f74876f03d4a2fb4802a6dc7001af44d3899027e07dfd8ee91d
size 288

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ecd8dab17f9e63f7dddaf589734a6cbd607c3b26816268c071bd4e1abea54ff4
size 292

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7f41bb7f11ef66619990b5d911a86306d9d8d0e2b07c7343d92e6b5e8398f2c
size 316

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0f75b14273f6328cb50b4f120487ceda09d6b88bcd4d6bfceab2ba4f34ce74e
size 332

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ad7987296c26af728fe348f486b6180180aeb43e0fcdb7109f73a3910c94f92
size 304

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a9c93af5f6a5d2c4688986320aa9a976df55df51ec54243ba827fcc28f42d56
size 292

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3d2025ecb300449865d455dae4940aeb585b249ad2fa7da3f2efebba0031d7b
size 288

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bcad1d2e69ed97302de39b83c83ec8c83a954e3c715b353be0733038f830dbb3
size 332

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a6a3e0e3091c798e01a4433e260519457dcdbe935c3f812251b68e997dbd91d
size 288

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76a6b65b1951bd15993da815b6c7629877489ca32e6d027bfbfa88c5d748dff3
size 288

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:300e38046ac0bcdbdc04f1a027ea08ee207bad59170de0cd1fc74f9cae14dab9
size 292

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0b8af9443410d653e2ba155ba2b4e44e6e06f747bf9548c778f88073f0487de
size 308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c40dcbb0f9620856579897cc3034aaa8031a30eb44024a5b832072f13c1d0ddf
size 1160

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fed2522498ce78bd0a828d6961f81dd197a91597cef9d025e6bc989de644a91f
size 528

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b6114b862f2e40a9b61807bd79cca39d401ea16485e6c84ca763234fa57ad58
size 516

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d6a0de1483469f211c801983157bbb44c45461e82dbc8cf0b28343d55519ec32
size 432

3
collection-games.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0be24afdf470e6a9f4a918d668478e8e9baf595841c0e86c882361ffeda2f148
size 452

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b7d6675d5446e3638079180fc1a01bd3e5e77a4f81d1860366449c6d074facf
size 552

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cbd895a25dea70e129fbc76ef409b8e3894ff0bc143ee1371824f21388392412
size 368

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:732269784fa6160b7f8d866da1e6aa8d1bdc5cc7d64a837518f869b943f403cc
size 380

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa42a8ffc2cbad1d3dff9d6b1cf1e31729c7110c400a37126fb4cb990d8dc9aa
size 520

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80a850ef837164034550310302fe0718e7b9ff2633fb335e6b839a798c2d0482
size 336

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba9d96ee274fa404401d5cf68e042528313b7c693eda51b64f724f21c662fed7
size 344

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b70a93b37a8573c60e919e9d9814872e6c952b4581098ea4f0ccf9a443ef540b
size 300

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cdcb4cb631659447f5874fd8c26ce79a7692fa0e51e8721f67d77d35e0481b2
size 516

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:544ed34256ea76abe210d352debeba6b278b48adc319e79ee76e0b2428aac12f
size 316

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:08ac91e1f1921d85fc562f6a9d5d830400ee9ac0aa198b240b91a7c2a62e9413
size 392

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c6624620f28c1dbf5aa6d045c83e7a1f916b966a7dcaa4f2bb2db76350232ea6
size 348

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05e1f850f70ec197ce5d01b4c703a7118e1acee40043121a7800ac4284ffe064
size 308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8eb29326f75697018cc50cccd4ca28a8a9889a300db49b5ff43a3563d800a793
size 308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de1be31f6e1a3c25eaccc2cf7933f5b36951f3311957990152c441f8000b89a6
size 316

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc37138566ab9b3602ccb2162f3879d41e8acbae516842ee1a9c5af19fa7a48a
size 316

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a423667f8e121ec1a6cb78f91391df559c1661b0986f382bfc2044aaf21f7482
size 400

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da54d809b5851b85fef4476e3de7495294df63503f83ac1f749bf2dad9d0913d
size 416

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5c2308d727125eb90dd17284c9cdd9b6e95700da06fbb6343ab397013fc9ae9
size 428

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e28956b3c8392336b21c5db2961bd9aa861a66823f22bfbe084c12c4c72b69c
size 304

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5fc7d375d41d779a9f8ce8047b39900e831fe3f58e01063cba2dd8bc1efc7929
size 316

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b541fc326da6019dda4754c6224cc306e8916145f73aa95dffc7010e8507257
size 396

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:777b04188335523eeb936d08362100d281c4c1f13c99875ea8e4a8a70ffdd669
size 352

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b4de8cef443a80cb15e980f5a11f0a06dc5ba46755e14deddc9b69766448bb4
size 308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3cc5c83751b7a64c1628621c4ab5c4754803c80c45640f0bcd59dda969115cd
size 308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5fa23e8834c133ea4c32bc1436a011b3134b6925312bc05242a66faa18085ab
size 316

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e87e5a69150e33b26d9e1c627b62d78bea03e045267e32ab14090e1523389ee
size 324

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40d26a99d1000c08730f21a724ef1f79340d0bb91dd5c07b98d31fa1a94aca55
size 308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4341a22423f3ece5881348abdcb985c61ec2dfd5e4b8b70a0f33b3df7c3bd6af
size 448

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab31927f5d6302d581453e7211ec9c1173dc64345d48069e1c72db432edbdb2e
size 376

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e0d3a5529a8d76e5af3ef4c7af41986ef99a8db2807a20f5da28f00ae14616b
size 320

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:862d1045b4400fd1ee1734decd9b651449181f9be3efd17b7555fbc672411f18
size 328

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f4ad135732b2c2209f94bb896a5c9c21e7bb7b744d12dad5e56b60a5ce4d15fc
size 312

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0814625764fb49cb6e33b214cb499299fd6e2f41306f979ff469c2ebb772c26
size 308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b242a4af8dd480de7787d0f07ef669eab9fcacee4a6ca0f797d83cf5d70b017
size 312

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:98b7b64f17b7e336ae58392c897f75dcbe027dc7ed0809f1fa9192b30edd88fe
size 308

3
collection-latex.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c93d12254a9cde3f21ed5025aa9411d753ae4c9d706906ffa93def9a4df8df3d
size 496

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c924d87dc4402b707b5bb5da607d06b565fa531ee46deed8e241bff934231275
size 3964

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e6bdac3c98077be92b929e7f2896fef86c01ea5530f64b0b8707bed1dff2f6a3
size 612

3
collection-luatex.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d7865e9f22cf77248c060150c860c23717e38312c9406dccc3adc0f5e0d56b5b
size 488

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12f4713ec8bdc71539b58f5131f58b723675b81c84ed6f98c77697eb9f8f062c
size 544

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a6a84b4e1ad7f20a645de5762b87a94c3ce059c7595d49989169ceeb989feb7
size 500

3
collection-music.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b0c8e187b00ec5e59de3db183bf6f495d22865b50ee3df4244177918f4f1c5a
size 360

3
collection-omega.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:26a807a82f3bb182ff76b70ac09000e399eee50b438a3f5869153a43bf2e1e8e
size 372

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:774fce693e2c90cc4a9b69c27c8f6bc224b279591161eda086125cc44e7cf230
size 772

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:278f49e7618a8f4f7f8a1fc0d74f621ac86e86ebe10291c76e67969c06efc770
size 456

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a874ce07a072de3429812098188dd707e70b3a6b347023a905d5c82b3d4797ff
size 680

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f083e090fa2bce4e24df3a78ffea78937c24baa79aa6b39d8f33c7ffeb1145e6
size 828

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0661211d42652f01593991f6ac7c4a9e8fdcff191ed9ba82757f5ff63673c813
size 616

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4f897adffc12d0f26b3683941a01d67c01a027f850f60d86d2a75e471584737
size 396

3
collection-xetex.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42188fb7a71f6d450f2906e6733571ae952c31e7b525250acd28a4d3a595f9c7
size 496

View File

@ -38,6 +38,9 @@
#ifndef TEXGRP
# define TEXGRP "public"
#endif
#ifndef MKTEX
# define "/usr/lib/mktex"
#endif
extern char **environ;
@ -51,11 +54,11 @@ static struct {
const char *run;
} *lp, list[] =
{ /* prog run */
{ "texhash", "/usr/lib/public/mktexlsr" },
{ "mktexlsr", "/usr/lib/public/mktexlsr" },
{ "mktexmf", "/usr/lib/public/mktexmf" },
{ "mktexpk", "/usr/lib/public/mktexpk" },
{ "mktextfm", "/usr/lib/public/mktextfm" },
{ "texhash", MKTEX "/mktexlsr" },
{ "mktexlsr", MKTEX "/mktexlsr" },
{ "mktexmf", MKTEX "/mktexmf" },
{ "mktexpk", MKTEX "/mktexpk" },
{ "mktextfm", MKTEX "/mktextfm" },
{ "false", "/bin/false" },
{ "true", "/bin/true" },
{ "public", "/bin/true" },

3
scheme-basic.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92c83a283e94d91d19733d8dcbfe3b4bf2c67946b88d8c7f47ab0d9adac9419f
size 440

3
scheme-context.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e8f952f5f508e92c71d944b50c4bdedfcc1282476a08711450e9125a578a0f4
size 388

3
scheme-full.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab71fad5f7faf7ab9b511b4deeaa972120d877091e655bbf8ced0d0a04234958
size 780

3
scheme-gust.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec12ebb635fc6fa558e20633f477c269510ad6e503198c971207feb0c294dadf
size 624

3
scheme-medium.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:63e7459c12cdc2c802bb86f28d0fb07d7838e1da4e62ecbcdb59aafbff82b38a
size 552

3
scheme-minimal.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:723263b980691835c3bb0cfb8b167f49b4c25d40419feeb91a069c952b75ec16
size 428

3
scheme-small.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd2c65ff6b73c0e6d3c06a10ede1d5e4492f8feb0710852e6c54141196c5f77f
size 556

3
scheme-tetex.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0453d1a975e2c45b71e71c18ec80c1c67f2b0e272bea7a3e4712f063bdf7acb
size 812

3
scheme-xml.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c82c4e499b38228ff473d548020c5bc47cb50740f05e414d6c0e3c0617a5e941
size 460

View File

@ -60,16 +60,16 @@
+#
+exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2
--- texk/seetexk/configure
+++ texk/seetexk/configure 2009-09-04 13:23:18.898401799 +0000
@@ -14169,7 +14169,7 @@ if test "x$with_kpathsea_libdir" != x &&
+++ texk/seetexk/configure 2012-06-12 16:08:20.232473178 +0200
@@ -14258,7 +14258,7 @@ if test "x$with_kpathsea_libdir" != x &&
KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS"
fi
else
- KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \
+ KPATHSEA_INCLUDES=`echo '-IBLD/texk/kpathsea -ISRC/texk/kpathsea -IBLD/texk -ISRC/texk' | sed \
-e "s,SRC/,$kpse_SRC/,g" \
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
- KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk"
+ KPATHSEA_INCLUDES="-I$kpse_BLD/texk/kpathsea -I$kpse_SRC/texk/kpathsea -I$kpse_BLD/texk -I$kpse_SRC/texk"
KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la"
KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la'
KPATHSEA_RULE='# Rebuild libkpathsea
--- texk/seetexk/dvibook.c
+++ texk/seetexk/dvibook.c 2009-08-28 14:13:32.721901870 +0000
@@ -27,6 +27,7 @@ extern char *optarg;

View File

@ -1,20 +1,20 @@
--- texk/web2c/eptexdir/eptex.ech
+++ texk/web2c/eptexdir/eptex.ech 2012-04-16 08:31:14.564665420 +0000
@@ -300,10 +300,13 @@ othercases goto next_p
hlist_node,vlist_node: begin r:=get_node(box_node_size);
@z
@x e-pTeX: just_copy
+ mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
@y
- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
+ mem[r+7]:=mem[p+7]; mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5];
+ {copy the last three words}
add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
+ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
@z
@x e-pTeX: ifcsname l.28620
|--- texk/web2c/eptexdir/eptex.ech
|+++ texk/web2c/eptexdir/eptex.ech 2012-04-16 08:31:14.564665420 +0000
|@@ -300,10 +300,13 @@ othercases goto next_p
| hlist_node,vlist_node: begin r:=get_node(box_node_size);
| @z
| @x e-pTeX: just_copy
|+ mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
| words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
| @y
|- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
|+ mem[r+7]:=mem[p+7]; mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5];
|+ {copy the last three words}
| add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
|+ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
| @z
|
| @x e-pTeX: ifcsname l.28620
--- texk/lacheck/lacheck.test
+++ texk/lacheck/lacheck.test 2012-04-16 09:22:42.763712955 +0000
@@ -6,5 +6,6 @@

View File

@ -233,617 +233,3 @@
#include "ptexlib.h"
/**********************************************************************/
--- texk/web2c/luatexdir/lua/lepdflib.cc
+++ texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-18 14:56:15.722565710 +0000
@@ -1,7 +1,7 @@
/* lepdflib.cc
- Copyright 2009-2011 Taco Hoekwater <taco@luatex.org>
- Copyright 2009-2011 Hartmut Henkel <hartmut@luatex.org>
+ Copyright 2009-2012 Taco Hoekwater <taco@luatex.org>
+ Copyright 2009-2012 Hartmut Henkel <hartmut@luatex.org>
This file is part of LuaTeX.
@@ -49,15 +49,13 @@ static const char *ErrorCodeNames[] = {
//**********************************************************************
#define M_Annot "Annot"
-#define M_AnnotBorder "AnnotBorder"
-#define M_AnnotBorderStyle "AnnotBorderStyle"
#define M_Annots "Annots"
#define M_Array "Array"
#define M_Catalog "Catalog"
-#define M_EmbFile "EmbFile"
#define M_Dict "Dict"
#define M_GooString "GooString"
#define M_LinkDest "LinkDest"
+#define M_Link "Link"
#define M_Links "Links"
#define M_Object "Object"
#define M_Page "Page"
@@ -65,8 +63,8 @@ static const char *ErrorCodeNames[] = {
#define M_PDFRectangle "PDFRectangle"
#define M_Ref "Ref"
#define M_Stream "Stream"
-#define M_XRef "XRef"
#define M_XRefEntry "XRefEntry"
+#define M_XRef "XRef"
//**********************************************************************
@@ -84,16 +82,9 @@ static udstruct *new_##type##_userdata(l
new_poppler_userdata(PDFDoc);
new_poppler_userdata(Annot);
-new_poppler_userdata(AnnotBorder);
-//new_poppler_userdata(AnnotBorderStyle);
-new_poppler_userdata(Annots);
new_poppler_userdata(Array);
new_poppler_userdata(Catalog);
new_poppler_userdata(Dict);
-#ifdef EMBFILE_IN_CATALOG_H
-new_poppler_userdata(EmbFile);
-#endif
-//new_poppler_userdata(GooString);
new_poppler_userdata(LinkDest);
new_poppler_userdata(Links);
new_poppler_userdata(Object);
@@ -102,7 +93,6 @@ new_poppler_userdata(PDFRectangle);
new_poppler_userdata(Ref);
new_poppler_userdata(Stream);
new_poppler_userdata(XRef);
-//new_poppler_userdata(XRefEntry);
//**********************************************************************
@@ -137,53 +127,6 @@ static int l_open_PDFDoc(lua_State * L)
return 1; // doc path
}
-static int l_new_Annot(lua_State * L)
-{
- udstruct *uxref, *udict, *ucatalog, *uref, *uout;
- uxref = (udstruct *) luaL_checkudata(L, 1, M_XRef);
- udict = (udstruct *) luaL_checkudata(L, 2, M_Dict);
- ucatalog = (udstruct *) luaL_checkudata(L, 3, M_Catalog);
- uref = (udstruct *) luaL_checkudata(L, 4, M_Ref);
- if (uxref->pd != ucatalog->pd || uxref->pd != udict->pd
- || uxref->pd != uref->pd)
- pdfdoc_differs_error(L);
- if ((uxref->pd != NULL && uxref->pd->pc != uxref->pc) ||
- (ucatalog->pd != NULL && ucatalog->pd->pc != ucatalog->pc) ||
- (udict->pd != NULL && udict->pd->pc != udict->pc) ||
- (uref->pd != NULL && uref->pd->pc != uref->pc))
- pdfdoc_changed_error(L);
- uout = new_Annot_userdata(L);
- uout->d =
- new Annot((XRef *) uxref->d, (Dict *) udict->d, (Catalog *) ucatalog->d,
- (Object *) uref->d);
- uout->atype = ALLOC_LEPDF;
- uout->pc = uxref->pc;
- uout->pd = uxref->pd;
- return 1;
-}
-
-static int l_new_Annots(lua_State * L)
-{
- udstruct *uxref, *ucatalog, *uannotsobj, *uout;
- uxref = (udstruct *) luaL_checkudata(L, 1, M_XRef);
- ucatalog = (udstruct *) luaL_checkudata(L, 2, M_Catalog);
- uannotsobj = (udstruct *) luaL_checkudata(L, 3, M_Object);
- if (uxref->pd != ucatalog->pd || uxref->pd != uannotsobj->pd)
- pdfdoc_differs_error(L);
- if ((uxref->pd != NULL && uxref->pd->pc != uxref->pc)
- || (ucatalog->pd != NULL && ucatalog->pd->pc != ucatalog->pc)
- || (uannotsobj->pd != NULL && uannotsobj->pd->pc != uannotsobj->pc))
- pdfdoc_changed_error(L);
- uout = new_Annots_userdata(L);
- uout->d =
- new Annots((XRef *) uxref->d, (Catalog *) ucatalog->d,
- (Object *) uannotsobj->d);
- uout->atype = ALLOC_LEPDF;
- uout->pc = uxref->pc;
- uout->pd = uxref->pd;
- return 1;
-}
-
static int l_new_Array(lua_State * L)
{
udstruct *uxref, *uout;
@@ -238,8 +181,6 @@ static int l_new_PDFRectangle(lua_State
static const struct luaL_Reg epdflib[] = {
{"open", l_open_PDFDoc},
- {"Annot", l_new_Annot},
- {"Annots", l_new_Annots},
{"Array", l_new_Array},
{"Dict", l_new_Dict},
{"Object", l_new_Object},
@@ -362,12 +303,26 @@ static int m_##type##__tostring(lua_Stat
return 1; \
}
+#define m_poppler_check_string(in, function) \
+static int m_##in##_##function(lua_State * L) \
+{ \
+ const char *s; \
+ udstruct *uin; \
+ uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \
+ if (uin->pd != NULL && uin->pd->pc != uin->pc) \
+ pdfdoc_changed_error(L); \
+ s = luaL_checkstring(L, 2); \
+ if (((in *) uin->d)->function((char *) s)) \
+ lua_pushboolean(L, 1); \
+ else \
+ lua_pushboolean(L, 0); \
+ return 1; \
+}
+
//**********************************************************************
// Annot
m_poppler_get_BOOL(Annot, isOk);
-m_poppler_get_OBJECT(Annot, getAppearance);
-m_poppler_get_poppler(Annot, AnnotBorder, getBorder);
static int m_Annot_match(lua_State * L)
{
@@ -405,8 +360,6 @@ static int m_Annot__gc(lua_State * L)
static const struct luaL_Reg Annot_m[] = {
{"isOk", m_Annot_isOk},
- {"getAppearance", m_Annot_getAppearance},
- {"getBorder", m_Annot_getBorder},
{"match", m_Annot_match},
{"__tostring", m_Annot__tostring},
{"__gc", m_Annot__gc},
@@ -414,38 +367,6 @@ static const struct luaL_Reg Annot_m[] =
};
//**********************************************************************
-// AnnotBorderStyle
-
-#ifdef HAVE_ANNOTBORDERSTYLE
-
-m_poppler_get_DOUBLE(AnnotBorderStyle, getWidth);
-
-m_poppler__tostring(AnnotBorderStyle);
-
-static int m_Annots__gc(lua_State * L)
-{
- udstruct *uin;
- uin = (udstruct *) luaL_checkudata(L, 1, M_Annots);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
- pdfdoc_changed_error(L);
-#ifdef DEBUG
- printf("\n===== Annots GC ===== uin=<%p>\n", uin);
-#endif
- if (uin->atype == ALLOC_LEPDF)
- delete(Annots *) uin->d;
- return 0;
-}
-
-static const struct luaL_Reg AnnotBorderStyle_m[] = {
- {"getWidth", m_AnnotBorderStyle_getWidth},
- {"__tostring", m_AnnotBorderStyle__tostring},
- {"__gc", m_Annots__gc},
- {NULL, NULL} // sentinel
-};
-
-#endif
-
-//**********************************************************************
// Annots
m_poppler_get_INT(Annots, getNumAnnots);
@@ -694,34 +615,6 @@ static int m_Catalog_findDest(lua_State
m_poppler_get_poppler(Catalog, Object, getDests);
m_poppler_get_INT(Catalog, numEmbeddedFiles);
-#ifdef EMBFILE_IN_CATALOG_H
-
-static int m_Catalog_embeddedFile(lua_State * L)
-{
- EmbFile *ef;
- int i, len;
- udstruct *uin, *uout;
- uin = (udstruct *) luaL_checkudata(L, 1, M_Catalog);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
- pdfdoc_changed_error(L);
- i = luaL_checkint(L, 2);
- len = ((Catalog *) uin->d)->numEmbeddedFiles();
- if (i > 0 && i <= len) {
- ef = ((Catalog *) uin->d)->embeddedFile(i - 1);
- if (ef != NULL) {
- uout = new_EmbFile_userdata(L);
- uout->d = ef;
- uout->pc = uin->pc;
- uout->pd = uin->pd;
- } else
- lua_pushnil(L);
- } else
- lua_pushnil(L);
- return 1;
-}
-
-#endif
-
m_poppler_get_INT(Catalog, numJS);
static int m_Catalog_getJS(lua_State * L)
@@ -763,9 +656,6 @@ static const struct luaL_Reg Catalog_m[]
{"findDest", m_Catalog_findDest},
{"getDests", m_Catalog_getDests},
{"numEmbeddedFiles", m_Catalog_numEmbeddedFiles},
-#ifdef EMBFILE_IN_CATALOG_H
- {"embeddedFile", m_Catalog_embeddedFile},
-#endif
{"numJS", m_Catalog_numJS},
{"getJS", m_Catalog_getJS},
{"getOutline", m_Catalog_getOutline},
@@ -775,53 +665,6 @@ static const struct luaL_Reg Catalog_m[]
};
//**********************************************************************
-// EmbFile
-
-#ifdef EMBFILE_IN_CATALOG_H
-
-m_poppler_get_GOOSTRING(EmbFile, name);
-m_poppler_get_GOOSTRING(EmbFile, description);
-m_poppler_get_INT(EmbFile, size);
-m_poppler_get_GOOSTRING(EmbFile, modDate);
-m_poppler_get_GOOSTRING(EmbFile, createDate);
-m_poppler_get_GOOSTRING(EmbFile, checksum);
-m_poppler_get_GOOSTRING(EmbFile, mimeType);
-
-static int m_EmbFile_streamObject(lua_State * L)
-{
- udstruct *uin, *uout;
- uin = (udstruct *) luaL_checkudata(L, 1, M_EmbFile);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
- pdfdoc_changed_error(L);
- uout = new_Object_userdata(L);
- uout->d = new Object(); // automatic init to type "none"
- ((EmbFile *) uin->d)->streamObject().copy((Object *) uout->d);
- uout->pc = uin->pc;
- uout->pd = uin->pd;
- return 1;
-}
-
-m_poppler_get_BOOL(EmbFile, isOk);
-
-m_poppler__tostring(EmbFile);
-
-static const struct luaL_Reg EmbFile_m[] = {
- {"name", m_EmbFile_name},
- {"description", m_EmbFile_description},
- {"size", m_EmbFile_size},
- {"modDate", m_EmbFile_modDate},
- {"createDate", m_EmbFile_createDate},
- {"checksum", m_EmbFile_checksum},
- {"mimeType", m_EmbFile_mimeType},
- {"streamObject", m_EmbFile_streamObject},
- {"isOk", m_EmbFile_isOk},
- {"__tostring", m_EmbFile__tostring},
- {NULL, NULL} // sentinel
-};
-
-#endif
-
-//**********************************************************************
// Dict
static int m_Dict_incRef(lua_State * L)
@@ -888,20 +731,7 @@ static int m_Dict_remove(lua_State * L)
return 0;
}
-static int m_Dict_is(lua_State * L)
-{
- const char *s;
- udstruct *uin;
- uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
- pdfdoc_changed_error(L);
- s = luaL_checkstring(L, 2);
- if (((Dict *) uin->d)->is((char *) s))
- lua_pushboolean(L, 1);
- else
- lua_pushboolean(L, 0);
- return 1;
-}
+m_poppler_check_string(Dict, is);
static int m_Dict_lookup(lua_State * L)
{
@@ -1012,6 +842,8 @@ static int m_Dict_getValNF(lua_State * L
return 1;
}
+m_poppler_check_string(Dict, hasKey);
+
m_poppler__tostring(Dict);
static const struct luaL_Reg Dict_m[] = {
@@ -1028,6 +860,7 @@ static const struct luaL_Reg Dict_m[] =
{"getKey", m_Dict_getKey},
{"getVal", m_Dict_getVal},
{"getValNF", m_Dict_getValNF},
+ {"hasKey", m_Dict_hasKey},
{"__tostring", m_Dict__tostring},
{NULL, NULL} // sentinel
};
@@ -1135,9 +968,13 @@ static const struct luaL_Reg LinkDest_m[
//**********************************************************************
// Links
+m_poppler_get_INT(Links, getNumLinks);
+
m_poppler__tostring(Links);
static const struct luaL_Reg Links_m[] = {
+ {"getNumLinks", m_Links_getNumLinks},
+ //{"getLink", m_Links_getLink},
{"__tostring", m_Links__tostring},
{NULL, NULL} // sentinel
};
@@ -1367,13 +1204,11 @@ static int m_Object_getType(lua_State *
static int m_Object_getTypeName(lua_State * L)
{
- char *s;
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
- s = ((Object *) uin->d)->getTypeName();
- lua_pushstring(L, s);
+ lua_pushstring(L, ((Object *) uin->d)->getTypeName());
return 1;
}
@@ -1465,15 +1300,13 @@ static int m_Object_getString(lua_State
static int m_Object_getName(lua_State * L)
{
- char *s;
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
- if (((Object *) uin->d)->isName()) {
- s = ((Object *) uin->d)->getName();
- lua_pushstring(L, s);
- } else
+ if (((Object *) uin->d)->isName())
+ lua_pushstring(L, ((Object *) uin->d)->getName());
+ else
lua_pushnil(L);
return 1;
}
@@ -1582,10 +1415,9 @@ static int m_Object_getCmd(lua_State * L
uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
- if (((Object *) uin->d)->isCmd()) {
- s = ((Object *) uin->d)->getCmd();
- lua_pushstring(L, s);
- } else
+ if (((Object *) uin->d)->isCmd())
+ lua_pushstring(L, ((Object *) uin->d)->getCmd());
+ else
lua_pushnil(L);
return 1;
}
@@ -2043,28 +1875,6 @@ m_poppler_get_poppler(Page, Dict, getSep
m_poppler_get_poppler(Page, Dict, getResourceDict);
m_poppler_get_OBJECT(Page, getAnnots);
-static int m_Page_getLinks(lua_State * L)
-{
- Links *links;
- udstruct *uin, *ucat, *uout;
- uin = (udstruct *) luaL_checkudata(L, 1, M_Page);
- ucat = (udstruct *) luaL_checkudata(L, 2, M_Catalog);
- if (uin->pd != NULL && ucat->pd != NULL && uin->pd != ucat->pd)
- pdfdoc_differs_error(L);
- if ((uin->pd != NULL && uin->pd->pc != uin->pc)
- || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc))
- pdfdoc_changed_error(L);
- links = ((Page *) uin->d)->getLinks((Catalog *) ucat->d);
- if (links != NULL) {
- uout = new_Links_userdata(L);
- uout->d = links;
- uout->pc = uin->pc;
- uout->pd = uin->pd;
- } else
- lua_pushnil(L);
- return 1;
-}
-
m_poppler_get_OBJECT(Page, getContents);
m_poppler__tostring(Page);
@@ -2091,7 +1901,6 @@ static const struct luaL_Reg Page_m[] =
{"getSeparationInfo", m_Page_getSeparationInfo},
{"getResourceDict", m_Page_getResourceDict},
{"getAnnots", m_Page_getAnnots},
- {"getLinks", m_Page_getLinks},
{"getContents", m_Page_getContents},
{"__tostring", m_Page__tostring},
{NULL, NULL} // sentinel
@@ -2276,19 +2085,23 @@ static int m_PDFDoc_findPage(lua_State *
static int m_PDFDoc_getLinks(lua_State * L)
{
- int i;
+ int i, pages;
Links *links;
udstruct *uin, *uout;
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
i = luaL_checkint(L, 2);
- links = ((PdfDocument *) uin->d)->doc->getLinks(i);
- if (links != NULL) {
- uout = new_Links_userdata(L);
- uout->d = links;
- uout->pc = uin->pc;
- uout->pd = uin->pd;
+ pages = ((PdfDocument *) uin->d)->doc->getNumPages();
+ if (i > 0 && i <= pages) {
+ links = ((PdfDocument *) uin->d)->doc->getLinks(i);
+ if (links != NULL) {
+ uout = new_Links_userdata(L);
+ uout->d = links;
+ uout->pc = uin->pc;
+ uout->pd = uin->pd;
+ } else
+ lua_pushnil(L);
} else
lua_pushnil(L);
return 1;
@@ -2367,6 +2180,8 @@ static int m_PDFDoc_getDocInfoNF(lua_Sta
m_PDFDoc_INT(getPDFMajorVersion);
m_PDFDoc_INT(getPDFMinorVersion);
+m_poppler__tostring(PDFDoc);
+
static int m_PDFDoc__gc(lua_State * L)
{
udstruct *uin;
@@ -2410,6 +2225,7 @@ static const struct luaL_Reg PDFDoc_m[]
{"getDocInfoNF", m_PDFDoc_getDocInfoNF},
{"getPDFMajorVersion", m_PDFDoc_getPDFMajorVersion},
{"getPDFMinorVersion", m_PDFDoc_getPDFMinorVersion},
+ {"__tostring", m_PDFDoc__tostring},
{"__gc", m_PDFDoc__gc}, // finalizer
{NULL, NULL} // sentinel
};
@@ -2555,11 +2371,6 @@ static const char *StreamKindNames[] =
"Flate", "JBIG2", "JPX", "Weird", NULL
};
-#if 0
-static const char *StreamColorSpaceModeNames[] =
- { "CSNone", "CSDeviceGray", "CSDeviceRGB", "CSDeviceCMYK", NULL };
-#endif
-
m_poppler_get_INT(Stream, getKind);
static int m_Stream_getKindName(lua_State * L)
@@ -2645,12 +2456,26 @@ static int m_XRef_fetch(lua_State * L)
m_poppler_get_OBJECT(XRef, getDocInfo);
m_poppler_get_OBJECT(XRef, getDocInfoNF);
m_poppler_get_INT(XRef, getNumObjects);
-// getLastXRefPos
m_poppler_get_INT(XRef, getRootNum);
m_poppler_get_INT(XRef, getRootGen);
// getStreamEnd
-m_poppler_get_INT(XRef, getSize);
-// getEntry
+
+static int m_XRef_getNumEntry(lua_State * L)
+{
+ int i, offset;
+ udstruct *uin;
+ uin = (udstruct *) luaL_checkudata(L, 1, M_XRef);
+ if (uin->pd != NULL && uin->pd->pc != uin->pc)
+ pdfdoc_changed_error(L);
+ offset = luaL_checkint(L, 2);
+ i = ((XRef *) uin->d)->getNumEntry(offset);
+ if (i >= 0)
+ lua_pushinteger(L, i);
+ else
+ lua_pushnil(L);
+ return 1;
+}
+
m_poppler_get_poppler(XRef, Object, getTrailerDict);
m_poppler__tostring(XRef);
@@ -2672,11 +2497,10 @@ static const struct luaL_Reg XRef_m[] =
{"getDocInfo", m_XRef_getDocInfo},
{"getDocInfoNF", m_XRef_getDocInfoNF},
{"getNumObjects", m_XRef_getNumObjects},
- //
{"getRootNum", m_XRef_getRootNum},
{"getRootGen", m_XRef_getRootGen},
- //
- {"getSize", m_XRef_getSize},
+ // {"getStreamEnd", m_XRef_getStreamEnd},
+ {"getNumEntry", m_XRef_getNumEntry},
{"getTrailerDict", m_XRef_getTrailerDict},
{"__tostring", m_XRef__tostring},
{NULL, NULL} // sentinel
@@ -2685,7 +2509,10 @@ static const struct luaL_Reg XRef_m[] =
//**********************************************************************
// XRefEntry
+m_poppler__tostring(XRefEntry);
+
static const struct luaL_Reg XRefEntry_m[] = {
+ {"__tostring", m_XRefEntry__tostring},
{NULL, NULL} // sentinel
};
@@ -2702,17 +2529,10 @@ static const struct luaL_Reg XRefEntry_m
int luaopen_epdf(lua_State * L)
{
register_meta(Annot);
- // TODO register_meta(AnnotBorder);
-#ifdef HAVE_ANNOTBORDERSTYLE
- register_meta(AnnotBorderStyle);
-#endif
register_meta(Annots);
register_meta(Array);
register_meta(Catalog);
register_meta(Dict);
-#ifdef EMBFILE_IN_CATALOG_H
- register_meta(EmbFile);
-#endif
register_meta(GooString);
register_meta(LinkDest);
register_meta(Links);
--- texk/web2c/luatexdir/lua/ltexlib.c
+++ texk/web2c/luatexdir/lua/ltexlib.c 2012-05-18 14:51:48.448218000 +0000
@@ -261,6 +261,9 @@ void luacstring_close(int n)
free(next->text);
t = next;
next = next->next;
+ if (t==read_spindle.tail) {
+ read_spindle.tail = NULL; /* prevent double free */
+ }
free(t);
}
read_spindle.head = NULL;
--- texk/web2c/luatexdir/lua/luainit.w
+++ texk/web2c/luatexdir/lua/luainit.w 2012-05-18 14:52:02.703975000 +0000
@@ -1,6 +1,6 @@
% luainit.w
%
-% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
% This file is part of LuaTeX.
@@ -328,7 +328,7 @@ static void parse_options(int argc, char
"the terms of the GNU General Public License, version 2. For more\n"
"information about these matters, see the file named COPYING and\n"
"the LuaTeX source.\n\n"
- "Copyright 2011 Taco Hoekwater, the LuaTeX Team.\n");
+ "Copyright 2012 Taco Hoekwater, the LuaTeX Team.\n");
/* *INDENT-ON* */
uexit(0);
} else if (ARGUMENT_IS("credits")) {
@@ -738,7 +738,7 @@ void lua_initialize(int ac, char **av)
argc = ac;
argv = av;
- if (asprintf(&banner, "This is LuaTeX, Version %s-%d (TeX Live 2012)",
+ if (asprintf(&banner, "This is LuaTeX, Version %s-%d" WEB2CVERSION,
luatex_version_string, luatex_date_info) < 0) {
exit(EXIT_FAILURE);
}

View File

@ -322,8 +322,8 @@
#if defined(WIN32) || defined(__CYGWIN__)
--- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2012-04-13 17:40:30.545560342 +0200
@@ -53,31 +53,34 @@ TEXMFROOT = $SELFAUTOPARENT
+++ texk/kpathsea/texmf.cnf 2012-06-12 16:27:01.749111534 +0200
@@ -55,31 +55,34 @@ TEXMFROOT = $SELFAUTOPARENT
% The tree containing runtime files related to the specific
% distribution and version.
@ -357,16 +357,16 @@
+TEXMFHOME = $HOME/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2011/texmf-var
-TEXMFVAR = ~/.texlive2012/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2011/texmf-config
-TEXMFCONFIG = ~/.texlive2012/texmf-config
+TEXMFCONFIG = ${TEXMFSYSCONFIG}
% List all the texmf trees.
%
@@ -92,7 +95,7 @@ TEXMFCONFIG = ~/.texlive2011/texmf-confi
@@ -94,7 +97,7 @@ TEXMFCONFIG = ~/.texlive2012/texmf-confi
% versions should take precedence over those -- although it is generally
% a source of confusion to have different versions of a package
% installed, whatever the trees, so try to avoid it.
@ -375,7 +375,7 @@
% Where to look for ls-R files. There need not be an ls-R in the
% directories in this path, but if there is one, Kpathsea will use it.
@@ -100,18 +103,17 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO
@@ -102,18 +105,17 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO
% does not create ls-R files in the non-!! elements -- because if an
% ls-R is present, it will be used, and the disk will not be searched.
% This is arguably a bug in kpathsea.
@ -396,7 +396,7 @@
% On some systems, there will be a system tree which contains all the font
% files that may be created as well as the formats. For example
@@ -122,7 +124,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
@@ -124,7 +126,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
%
% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
% one of the TEXMF directories (avoids overlapping ls-R files).
@ -405,7 +405,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Usually you will not need to edit any of the following variables.
@@ -130,7 +132,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
@@ -132,7 +134,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
% WEB2C is for Web2C specific files. The current directory may not be
% a good place to look for them.
@ -414,7 +414,7 @@
% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
% or \openin, including .sty, .eps, etc. We specify paths for all known
@@ -171,23 +173,23 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{
@@ -173,23 +175,23 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{
TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}//
% pdfTeX.
@ -451,7 +451,7 @@
% LuaTeX.
TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
@@ -229,18 +231,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
@@ -231,18 +233,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic}//
% jadetex.
@ -476,7 +476,7 @@
% Earlier entries override later ones, so put this generic one last.
TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
@@ -259,13 +261,13 @@ MPINPUTS = .;$TEXMF/metapost//
@@ -261,13 +263,13 @@ MPINPUTS = .;$TEXMF/metapost//
% We repeat the same definition three times because of the way fmtutil
% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
% will not be found.
@ -494,7 +494,7 @@
MFPOOL = ${TEXPOOL}
MPPOOL = ${TEXPOOL}
@@ -293,7 +295,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
@@ -295,7 +297,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
GLYPHFONTS = .;$TEXMF/fonts
% A place to puth everything that doesn't fit the other font categories.
@ -503,7 +503,7 @@
% font name map files. This isn't just fonts/map// because ConTeXt
% wants support for having files with the same name in the different
@@ -375,8 +377,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
@@ -377,8 +379,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
% For xdvi to find mime.types and .mailcap, if they do not exist in
% ~. These are single directories, not paths.
% (But the default mime.types, at least, may well suffice.)
@ -514,17 +514,41 @@
% Default settings for the fontconfig library as used by the Windows
% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores
@@ -463,7 +465,8 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
@@ -481,19 +483,20 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
% explicitly list every directory. Arguably more understandable this
% way anyway.
%
% For security reasons, it is better not to include . in this path.
%
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-TEXMFCNF = {\
-$SELFAUTOLOC,\
-$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\
-$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\
-$SELFAUTODIR,\
-$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\
-$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\
-$SELFAUTOPARENT/../texmf-local/web2c,\
-$SELFAUTOPARENT,\
-$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\
-$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\
-}
-%
+TEXMFCNF = /etc/texmf;/etc/texmf/web2c;/var/lib/texmf/web2c;$TEXMF/web2c
+
+% For reference, here is the upstream definition:
+%TEXMFCNF = {\
+%$SELFAUTOLOC,\
+%$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\
+%$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\
+%$SELFAUTODIR,\
+%$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\
+%$SELFAUTOPARENT/../texmf-local/web2c,\
+%$SELFAUTOPARENT,\
+%$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\
+%$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\
+%}
% For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
% expansions from binaries linked against an earlier version of the
@@ -642,9 +645,9 @@ BIBTEX_CSFILE = 88591lat.csf
@@ -675,9 +678,9 @@ BIBTEX_CSFILE = 88591lat.csf
% For some xy-pic samples, you may need as much as 700000 words of memory.
% For the vast majority of documents, 60000 or less will do.
%
@ -537,7 +561,7 @@
% ConTeXt needs lots of memory.
extra_mem_top.context = 2000000
@@ -728,3 +731,33 @@ max_strings.pbibtex = 35307
@@ -761,3 +764,33 @@ max_strings.pbibtex = 35307
line_length.gftype = 500
max_rows.gftype = 8191
max_cols.gftype = 8191
@ -1086,16 +1110,3 @@
+ exec -a xdvi @final_exec_name@ $NAMEOPT ${1+"$@"}
+fi
+
--- utils/asymptote/Makefile.in
+++ utils/asymptote/Makefile.in 2011-12-13 10:26:35.111646882 +0000
@@ -55,8 +55,8 @@ CFLAGS = @CPPFLAGS@ @CFLAGS@
OPTS = $(DEFS) $(CFLAGS)
INCL = -I . @INCL@
-CXX = @CXX@ -Wall -ansi
-CC = @CC@ -Wall -ansi
+CXX = @CXX@ -Wall
+CC = @CC@ -Wall
MAKEDEPEND = $(OPTS) -O0 -M -DDEPEND
BISON = bison
LEX = @LEX@

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc7b0b273048ce9309fd7971bd5aebc24f2622dbda3f2d630c88a70071962483
size 104146274

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d36a0c5910e08cb24c0ca87214e23cd6df5519dc9ce32afac8b71296a25a909a
size 78033316

18369
texlive-filesystem.spec Normal file

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More