diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4fb08a4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +*.html +*.gz +temp/* +temp2/* +!LICENSE.html +mdp.php +style.min.css diff --git a/404.php b/404.php deleted file mode 100755 index 96951d0..0000000 --- a/404.php +++ /dev/null @@ -1,13 +0,0 @@ - - -
- Le texte 'erreur 404' en train d'être mangé par des fourmis - -

- La page à laquelle vous avez tenté d'accéder a été Antièrement dévorée par une armée de fourmis affamées ! -

- - Page d'accueil -
- diff --git a/README.md b/README.md index c706f17..63647a4 100755 --- a/README.md +++ b/README.md @@ -1,19 +1,23 @@ # Présentation -Voici le code source de mon site : . -Il devrait fonctionner simplement avec la dernière version de PHP et un serveur Web. +Ceci est le code source du [site web d'Antopie](https://antopie.org). +C'est un générateur de sites statiques : il faut charger le fichier `compil.php` pour actualiser le contenu. +Les pages sont rédigées principalement en Markdown Extra mais il est aussi possible de rajouter de l'HTML et du PHP. +Elles sont ensuite transformées par compil.php en pages HTML statiques. # Bibliothèques utilisées -Le dossier bibli contient des dépendances incluses dans ce site. +Le dossier bibli contient les dépendances incluses dans ce site. -| Nom | Description | Source | -| -------- | ----------------------- | ------------------------------------------ | -| ubuntu | La police Ubuntu | https://design.ubuntu.com/font/ | -| fontello | Pack d'icônes | http://fontello.com/ | -| lesserphp | Compilateur Less en PHP | https://github.com/MarcusSchwarz/lesserphp | -| Konami-JS | Le code de Konami | https://snaptortoise.github.io/konami-js | -| Gomez CSS | Gomez de Fez en CSS | https://github.com/maisano/gomez-css | +| Nom | Description | Source | +| --------------- | --------------------------------- | ------------------------------------------- | +| ubuntu | La police Ubuntu | https://design.ubuntu.com/font | +| fontello | Pack d'icônes | http://fontello.com | +| lesserphp | Compilateur Less en PHP | https://github.com/MarcusSchwarz/lesserphp | +| konami-js | Le code de Konami | https://snaptortoise.github.io/konami-js | +| gomez css | Gomez du jeu vidéo Fez en CSS | https://github.com/maisano/gomez-css | +| static-compress | Compression de fichiers statiques | https://github.com/neosmart/static-compress | +| parsedown | Compilateur Markdown en PHP | https://parsedown.org | # Licence diff --git a/bibli/fontello/LICENSE.txt b/bibli/fontello/LICENSE.txt old mode 100755 new mode 100644 diff --git a/bibli/fontello/LICENSE.txt.gz b/bibli/fontello/LICENSE.txt.gz deleted file mode 100644 index 1344316..0000000 Binary files a/bibli/fontello/LICENSE.txt.gz and /dev/null differ diff --git a/bibli/fontello/README.txt b/bibli/fontello/README.txt old mode 100755 new mode 100644 diff --git a/bibli/fontello/README.txt.gz b/bibli/fontello/README.txt.gz deleted file mode 100644 index c303ef3..0000000 Binary files a/bibli/fontello/README.txt.gz and /dev/null differ diff --git a/bibli/fontello/config.json b/bibli/fontello/config.json old mode 100755 new mode 100644 index 71555e9..a1c4092 --- a/bibli/fontello/config.json +++ b/bibli/fontello/config.json @@ -7,16 +7,18 @@ "ascent": 850, "glyphs": [ { - "uid": "72b1277834cba5b7944b0a6cac7ddb0d", - "css": "rss", - "code": 61598, - "src": "fontawesome" - }, - { - "uid": "d73eceadda1f594cec0536087539afbf", - "css": "heart-2", - "code": 59580, - "src": "fontawesome" + "uid": "2a540649f305b0747c08e168c135b191", + "css": "ynh", + "code": 59392, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M1141.2 600C1117.4 658.6 1043.2 666.7 976.5 682.4 969.3 756.4 1012.4 811.2 964.7 870.6 889.3 867.5 876.8 801.7 882.4 717.6 870.6 717.6 858.8 717.6 847.1 717.6 822.5 750.2 857.6 770.8 847.1 811.8 833.9 862.8 754.4 904.8 717.6 894.1 692 886.6 647.5 816.1 658.8 752.9 692 721.1 691.3 789.6 729.4 788.2 788.8 696 616.1 687.6 635.3 588.2 649.9 512.7 772.5 474.6 811.8 576.5 829.9 626 750.9 578.4 752.9 611.8 749.7 630.8 764.1 632 764.7 647.1 794.4 656.1 784.5 621.6 800 611.8 821.9 598 836.4 602.9 870.6 600 899.4 570 883.3 495.1 917.6 470.6 963.2 476 989.2 501.1 988.2 552.9 1070.7 542.5 1109.4 541.8 1141.2 600ZM1023.5 152.9C1030.7 190.7 1050.8 211.5 1047.1 247.1 1043.1 284.8 1012.9 350.9 1000 352.9 986.2 355.1 984.2 373.9 976.5 376.5 921.6 394.9 830.7 359.1 811.8 294.1 798.1 247.4 834.1 136.8 858.8 94.1 874.1 67.6 873.2 58.9 917.6 47.1 946 39.4 960.6 20.6 988.2 47.1 993.8 52.4 1003.5 52.8 1010 57.5 1007.7 57.5 1033.5 94.5 1035.3 105.9 1039.1 130.2 1020.8 138.6 1023.5 152.9ZM929.4 258.8C950.3 236.6 968.1 211.3 964.7 164.7 911.6 145.1 878.5 250.6 929.4 258.8ZM788.2 247.1C787.4 315.4 817.4 372.9 788.2 423.5 709.1 436 703.1 375.3 658.8 352.9 636 369.3 641.3 413.9 623.5 435.3 579.1 440.5 568.4 412.1 541.2 400 570.2 308.1 556 176.7 564.7 94.1 665.6 87.3 655.1 192 705.9 235.3 712 184.2 701.7 52.7 741.2 0 827.4 38.7 789.3 152.8 788.2 247.1ZM611.8 647.1C634.5 746 613.2 914 470.6 882.4 451.9 878.2 371.5 820.9 364.7 800 345.6 741.2 368.7 643.1 400 611.8 459.2 552.6 535.1 592.5 611.8 647.1ZM458.8 776.5C512.4 787.8 532.9 727.1 505.9 694.1 463.2 694.5 454.2 728.7 458.8 776.5ZM458.8 94.1C524.5 104.7 534.1 174.2 517.6 270.6 500.8 369.2 482.1 442.2 411.8 447.1 299.2 454.7 267.6 250.7 305.9 105.9 403.8 120.8 383.4 227.8 376.5 305.9 408.4 315.6 402.4 295.9 411.8 282.4 435.9 247.5 444.9 160.1 458.8 94.1ZM329.4 729.4C330.6 796.1 381.2 862.7 352.9 929.4 302.1 917.5 275.6 881.3 247.1 847.1 210 841.4 220.5 883.2 176.5 870.6 168.6 930.1 203.4 959.6 164.7 988.2 109.4 980.8 86.4 941.2 70.6 894.1 39.9 877.9 6.1 864.5 0 823.5 1.6 782 52.7 790 82.4 776.5 87.9 711.4 65.8 618.7 105.9 588.2 203.6 594 202.5 672.1 188.2 764.7 239.5 768.1 246.4 713.5 247.1 682.4 247.8 653.8 225.6 585.2 270.6 552.9 306.6 544.4 305.2 573.3 341.2 564.7 380.6 620 328.5 675.8 329.4 729.4ZM282.4 141.2C294.9 224.4 236.9 236.9 211.8 282.4 214.2 363.3 206.2 433.6 188.2 494.1 119.3 478.6 85.9 372 117.6 294.1 113.8 252.7 55.8 244.5 35.3 200 31.8 192.2 29.8 147.9 23.5 117.6 12.8 66.2 6.5 50.7 35.3 11.8 131.3 6 120.1 107.4 141.2 176.5 200.6 181.1 187.2 112.7 235.3 105.9 246.8 121.8 266.7 129.4 282.4 141.2Z", + "width": 1153 + }, + "search": [ + "logo-ynh-white" + ] }, { "uid": "e7cb72a17f3b21e3576f35c3f0a7639b", @@ -25,76 +27,22 @@ "src": "fontawesome" }, { - "uid": "dec0ce0476433f7e49e096526cf89465", - "css": "hammer", - "code": 59392, + "uid": "399ef63b1e23ab1b761dfbb5591fa4da", + "css": "right-open", + "code": 59394, "src": "fontawesome" }, { - "uid": "63b86fedd4ee9ad2105f54f4888e7088", - "css": "info", - "code": 59393, + "uid": "1d7c1d30ad49a988556273a238097c2a", + "css": "doc-text-inv", + "code": 59395, "src": "entypo" }, - { - "uid": "ff1710a605b3fc98346903db89034558", - "css": "balance-scale", - "code": 62030, - "src": "fontawesome" - }, { "uid": "d7271d490b71df4311e32cdacae8b331", "css": "home", - "code": 59605, + "code": 59393, "src": "fontawesome" - }, - { - "uid": "7034e4d22866af82bef811f52fb1ba46", - "css": "code", - "code": 61729, - "src": "fontawesome" - }, - { - "uid": "fb0987460443f915099339013ad101ef", - "css": "logo-ynh-white", - "code": 59394, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M1141.2 600C1117.4 658.6 1043.2 666.7 976.5 682.4 969.3 756.4 1012.4 811.2 964.7 870.6 889.3 867.5 876.8 801.7 882.4 717.6 870.6 717.6 858.8 717.6 847.1 717.6 822.5 750.2 857.6 770.8 847.1 811.8 833.9 862.8 754.4 904.8 717.6 894.1 692 886.6 647.5 816.1 658.8 752.9 692 721.1 691.3 789.6 729.4 788.2 788.8 696 616.1 687.6 635.3 588.2 649.9 512.7 772.5 474.6 811.8 576.5 829.9 626 750.9 578.4 752.9 611.8 749.7 630.8 764.1 632 764.7 647.1 794.4 656.1 784.5 621.6 800 611.8 821.9 598 836.4 602.9 870.6 600 899.4 570 883.3 495.1 917.6 470.6 963.2 476 989.2 501.1 988.2 552.9 1070.7 542.5 1109.4 541.8 1141.2 600ZM1023.5 152.9C1030.7 190.7 1050.8 211.5 1047.1 247.1 1043.1 284.8 1012.9 350.9 1000 352.9 986.2 355.1 984.2 373.9 976.5 376.5 921.6 394.9 830.7 359.1 811.8 294.1 798.1 247.4 834.1 136.8 858.8 94.1 874.1 67.6 873.2 58.9 917.6 47.1 946 39.4 960.6 20.6 988.2 47.1 993.8 52.4 1003.5 52.8 1010 57.5 1007.7 57.5 1033.5 94.5 1035.3 105.9 1039.1 130.2 1020.8 138.6 1023.5 152.9ZM929.4 258.8C950.3 236.6 968.1 211.3 964.7 164.7 911.6 145.1 878.5 250.6 929.4 258.8ZM788.2 247.1C787.4 315.4 817.4 372.9 788.2 423.5 709.1 436 703.1 375.3 658.8 352.9 636 369.3 641.3 413.9 623.5 435.3 579.1 440.5 568.4 412.1 541.2 400 570.2 308.1 556 176.7 564.7 94.1 665.6 87.3 655.1 192 705.9 235.3 712 184.2 701.7 52.7 741.2 0 827.4 38.7 789.3 152.8 788.2 247.1ZM611.8 647.1C634.5 746 613.2 914 470.6 882.4 451.9 878.2 371.5 820.9 364.7 800 345.6 741.2 368.7 643.1 400 611.8 459.2 552.6 535.1 592.5 611.8 647.1ZM458.8 776.5C512.4 787.8 532.9 727.1 505.9 694.1 463.2 694.5 454.2 728.7 458.8 776.5ZM458.8 94.1C524.5 104.7 534.1 174.2 517.6 270.6 500.8 369.2 482.1 442.2 411.8 447.1 299.2 454.7 267.6 250.7 305.9 105.9 403.8 120.8 383.4 227.8 376.5 305.9 408.4 315.6 402.4 295.9 411.8 282.4 435.9 247.5 444.9 160.1 458.8 94.1ZM329.4 729.4C330.6 796.1 381.2 862.7 352.9 929.4 302.1 917.5 275.6 881.3 247.1 847.1 210 841.4 220.5 883.2 176.5 870.6 168.6 930.1 203.4 959.6 164.7 988.2 109.4 980.8 86.4 941.2 70.6 894.1 39.9 877.9 6.1 864.5 0 823.5 1.6 782 52.7 790 82.4 776.5 87.9 711.4 65.8 618.7 105.9 588.2 203.6 594 202.5 672.1 188.2 764.7 239.5 768.1 246.4 713.5 247.1 682.4 247.8 653.8 225.6 585.2 270.6 552.9 306.6 544.4 305.2 573.3 341.2 564.7 380.6 620 328.5 675.8 329.4 729.4ZM282.4 141.2C294.9 224.4 236.9 236.9 211.8 282.4 214.2 363.3 206.2 433.6 188.2 494.1 119.3 478.6 85.9 372 117.6 294.1 113.8 252.7 55.8 244.5 35.3 200 31.8 192.2 29.8 147.9 23.5 117.6 12.8 66.2 6.5 50.7 35.3 11.8 131.3 6 120.1 107.4 141.2 176.5 200.6 181.1 187.2 112.7 235.3 105.9 246.8 121.8 266.7 129.4 282.4 141.2Z", - "width": 1153 - }, - "search": [ - "logo-ynh-white" - ] - }, - { - "uid": "d90d83593e5e742d86d8708c6f7cb025", - "css": "logo-ynh-white-1", - "code": 59395, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M1141.2 600C1117.4 658.6 1043.2 666.7 976.5 682.4 969.3 756.4 1012.4 811.2 964.7 870.6 889.3 867.5 876.8 801.7 882.4 717.6 870.6 717.6 858.8 717.6 847.1 717.6 822.5 750.2 857.6 770.8 847.1 811.8 833.9 862.8 754.4 904.8 717.6 894.1 692 886.6 647.5 816.1 658.8 752.9 692 721.1 691.3 789.6 729.4 788.2 788.8 696 616.1 687.6 635.3 588.2 649.9 512.7 772.5 474.6 811.8 576.5 829.9 626 750.9 578.4 752.9 611.8 749.7 630.8 764.1 632 764.7 647.1 794.4 656.1 784.5 621.6 800 611.8 821.9 598 836.4 602.9 870.6 600 899.4 570 883.3 495.1 917.6 470.6 963.2 476 989.2 501.1 988.2 552.9 1070.7 542.5 1109.4 541.8 1141.2 600ZM1023.5 152.9C1030.7 190.7 1050.8 211.5 1047.1 247.1 1043.1 284.8 1012.9 350.9 1000 352.9 986.2 355.1 984.2 373.9 976.5 376.5 921.6 394.9 830.7 359.1 811.8 294.1 798.1 247.4 834.1 136.8 858.8 94.1 874.1 67.6 873.2 58.9 917.6 47.1 946 39.4 960.6 20.6 988.2 47.1 993.8 52.4 1003.5 52.8 1010 57.5 1007.7 57.5 1033.5 94.5 1035.3 105.9 1039.1 130.2 1020.8 138.6 1023.5 152.9ZM929.4 258.8C950.3 236.6 968.1 211.3 964.7 164.7 911.6 145.1 878.5 250.6 929.4 258.8ZM788.2 247.1C787.4 315.4 817.4 372.9 788.2 423.5 709.1 436 703.1 375.3 658.8 352.9 636 369.3 641.3 413.9 623.5 435.3 579.1 440.5 568.4 412.1 541.2 400 570.2 308.1 556 176.7 564.7 94.1 665.6 87.3 655.1 192 705.9 235.3 712 184.2 701.7 52.7 741.2 0 827.4 38.7 789.3 152.8 788.2 247.1ZM611.8 647.1C634.5 746 613.2 914 470.6 882.4 451.9 878.2 371.5 820.9 364.7 800 345.6 741.2 368.7 643.1 400 611.8 459.2 552.6 535.1 592.5 611.8 647.1ZM458.8 776.5C512.4 787.8 532.9 727.1 505.9 694.1 463.2 694.5 454.2 728.7 458.8 776.5ZM458.8 94.1C524.5 104.7 534.1 174.2 517.6 270.6 500.8 369.2 482.1 442.2 411.8 447.1 299.2 454.7 267.6 250.7 305.9 105.9 403.8 120.8 383.4 227.8 376.5 305.9 408.4 315.6 402.4 295.9 411.8 282.4 435.9 247.5 444.9 160.1 458.8 94.1ZM329.4 729.4C330.6 796.1 381.2 862.7 352.9 929.4 302.1 917.5 275.6 881.3 247.1 847.1 210 841.4 220.5 883.2 176.5 870.6 168.6 930.1 203.4 959.6 164.7 988.2 109.4 980.8 86.4 941.2 70.6 894.1 39.9 877.9 6.1 864.5 0 823.5 1.6 782 52.7 790 82.4 776.5 87.9 711.4 65.8 618.7 105.9 588.2 203.6 594 202.5 672.1 188.2 764.7 239.5 768.1 246.4 713.5 247.1 682.4 247.8 653.8 225.6 585.2 270.6 552.9 306.6 544.4 305.2 573.3 341.2 564.7 380.6 620 328.5 675.8 329.4 729.4ZM282.4 141.2C294.9 224.4 236.9 236.9 211.8 282.4 214.2 363.3 206.2 433.6 188.2 494.1 119.3 478.6 85.9 372 117.6 294.1 113.8 252.7 55.8 244.5 35.3 200 31.8 192.2 29.8 147.9 23.5 117.6 12.8 66.2 6.5 50.7 35.3 11.8 131.3 6 120.1 107.4 141.2 176.5 200.6 181.1 187.2 112.7 235.3 105.9 246.8 121.8 266.7 129.4 282.4 141.2Z", - "width": 1153 - }, - "search": [ - "logo-ynh-white" - ] - }, - { - "uid": "d58c84625fe33cc34472940104639c34", - "css": "ynh", - "code": 59396, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M1141.2 600C1117.4 658.6 1043.2 666.7 976.5 682.4 969.3 756.4 1012.4 811.2 964.7 870.6 889.3 867.5 876.8 801.7 882.4 717.6H847.1C822.5 750.2 857.6 770.8 847.1 811.8 833.9 862.8 754.4 904.8 717.6 894.1 692 886.6 647.5 816.1 658.8 752.9 692 721.1 691.3 789.6 729.4 788.2 788.8 696 616.1 687.6 635.3 588.2 649.9 512.7 772.5 474.6 811.8 576.5 829.9 626 750.9 578.4 752.9 611.8 749.7 630.8 764.1 632 764.7 647.1 794.4 656.1 784.5 621.6 800 611.8 821.9 598 836.4 602.9 870.6 600 899.4 570 883.3 495.1 917.6 470.6 963.2 476 989.2 501.1 988.2 552.9 1070.7 542.5 1109.4 541.8 1141.2 600ZM1023.5 152.9C1030.7 190.7 1050.8 211.5 1047.1 247.1 1043.1 284.8 1012.9 350.9 1000 352.9 986.2 355.1 984.2 373.9 976.5 376.5 921.6 394.9 830.7 359.1 811.8 294.1 798.1 247.4 834.1 136.8 858.8 94.1 874.1 67.6 873.2 58.9 917.6 47.1 946 39.4 960.6 20.6 988.2 47.1 993.8 52.4 1003.5 52.8 1010 57.5 1007.7 57.5 1033.5 94.5 1035.3 105.9 1039.1 130.2 1020.8 138.6 1023.5 152.9ZM929.4 258.8C950.3 236.6 968.1 211.3 964.7 164.7 911.6 145.1 878.5 250.6 929.4 258.8ZM788.2 247.1C787.4 315.4 817.4 372.9 788.2 423.5 709.1 436 703.1 375.3 658.8 352.9 636 369.3 641.3 413.9 623.5 435.3 579.1 440.5 568.4 412.1 541.2 400 570.2 308.1 556 176.7 564.7 94.1 665.6 87.3 655.1 192 705.9 235.3 712 184.2 701.7 52.7 741.2 0 827.4 38.7 789.3 152.8 788.2 247.1ZM611.8 647.1C634.5 746 613.2 914 470.6 882.4 451.9 878.2 371.5 820.9 364.7 800 345.6 741.2 368.7 643.1 400 611.8 459.2 552.6 535.1 592.5 611.8 647.1ZM458.8 776.5C512.4 787.8 532.9 727.1 505.9 694.1 463.2 694.5 454.2 728.7 458.8 776.5ZM458.8 94.1C524.5 104.7 534.1 174.2 517.6 270.6 500.8 369.2 482.1 442.2 411.8 447.1 299.2 454.7 267.6 250.7 305.9 105.9 403.8 120.8 383.4 227.8 376.5 305.9 408.4 315.6 402.4 295.9 411.8 282.4 435.9 247.5 444.9 160.1 458.8 94.1ZM329.4 729.4C330.6 796.1 381.2 862.7 352.9 929.4 302.1 917.5 275.6 881.3 247.1 847.1 210 841.4 220.5 883.2 176.5 870.6 168.6 930.1 203.4 959.6 164.7 988.2 109.4 980.8 86.4 941.2 70.6 894.1 39.9 877.9 6.1 864.5 0 823.5 1.6 782 52.7 790 82.4 776.5 87.9 711.4 65.8 618.7 105.9 588.2 203.6 594 202.5 672.1 188.2 764.7 239.5 768.1 246.4 713.5 247.1 682.4 247.8 653.8 225.6 585.2 270.6 552.9 306.6 544.4 305.2 573.3 341.2 564.7 380.6 620 328.5 675.8 329.4 729.4ZM282.4 141.2C294.9 224.4 236.9 236.9 211.8 282.4 214.2 363.3 206.2 433.6 188.2 494.1 119.3 478.6 85.9 372 117.6 294.1 113.8 252.7 55.8 244.5 35.3 200 31.8 192.2 29.8 147.9 23.5 117.6 12.8 66.2 6.5 50.7 35.3 11.8 131.3 6 120.1 107.4 141.2 176.5 200.6 181.1 187.2 112.7 235.3 105.9 246.8 121.8 266.7 129.4 282.4 141.2Z", - "width": 1153 - }, - "search": [ - "ynh" - ] } ] } \ No newline at end of file diff --git a/bibli/fontello/css/animation.css b/bibli/fontello/css/animation.css old mode 100755 new mode 100644 diff --git a/bibli/fontello/css/animation.css.gz b/bibli/fontello/css/animation.css.gz deleted file mode 100644 index 8a40b0d..0000000 Binary files a/bibli/fontello/css/animation.css.gz and /dev/null differ diff --git a/bibli/fontello/css/fontello-codes.css b/bibli/fontello/css/fontello-codes.css old mode 100755 new mode 100644 index 8173d95..c9d8db6 --- a/bibli/fontello/css/fontello-codes.css +++ b/bibli/fontello/css/fontello-codes.css @@ -1,12 +1,6 @@ -.icon-hammer:before { content: '\e800'; } /* '' */ -.icon-info:before { content: '\e801'; } /* '' */ -.icon-logo-ynh-white:before { content: '\e802'; } /* '' */ -.icon-logo-ynh-white-1:before { content: '\e803'; } /* '' */ -.icon-ynh:before { content: '\e804'; } /* '' */ -.icon-heart-2:before { content: '\e8bc'; } /* '' */ -.icon-home:before { content: '\e8d5'; } /* '' */ -.icon-rss:before { content: '\f09e'; } /* '' */ -.icon-code:before { content: '\f121'; } /* '' */ -.icon-git:before { content: '\f1d3'; } /* '' */ -.icon-balance-scale:before { content: '\f24e'; } /* '' */ \ No newline at end of file +.icon-ynh:before { content: '\e800'; } /* '' */ +.icon-home:before { content: '\e801'; } /* '' */ +.icon-right-open:before { content: '\e802'; } /* '' */ +.icon-doc-text-inv:before { content: '\e803'; } /* '' */ +.icon-git:before { content: '\f1d3'; } /* '' */ \ No newline at end of file diff --git a/bibli/fontello/css/fontello-codes.css.gz b/bibli/fontello/css/fontello-codes.css.gz deleted file mode 100644 index 5c3cba9..0000000 Binary files a/bibli/fontello/css/fontello-codes.css.gz and /dev/null differ diff --git a/bibli/fontello/css/fontello-embedded.css b/bibli/fontello/css/fontello-embedded.css old mode 100755 new mode 100644 index 65e4d05..ce514c2 --- a/bibli/fontello/css/fontello-embedded.css +++ b/bibli/fontello/css/fontello-embedded.css @@ -1,15 +1,15 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?50623770'); - src: url('../font/fontello.eot?50623770#iefix') format('embedded-opentype'), - url('../font/fontello.svg?50623770#fontello') format('svg'); + src: url('../font/fontello.eot?61467111'); + src: url('../font/fontello.eot?61467111#iefix') format('embedded-opentype'), + url('../font/fontello.svg?61467111#fontello') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'fontello'; - src: url('data:application/octet-stream;base64,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') format('woff'), - url('data:application/octet-stream;base64,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AxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKyAAEAKrEABUKzCgIBCCqxAAVCsw4AAQgqsQAGQroCwAABAAkqsQAHQroAQAABAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbMMAgEMKrgB/4WwBI2xAgBEAAA=') format('truetype'); + src: url('data:application/octet-stream;base64,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') format('woff'), + url('data:application/octet-stream;base64,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') format('truetype'); } /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ @@ -17,7 +17,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?50623770#fontello') format('svg'); + src: url('../font/fontello.svg?61467111#fontello') format('svg'); } } */ @@ -26,7 +26,7 @@ font-family: "fontello"; font-style: normal; font-weight: normal; - speak: none; + speak: never; display: inline-block; text-decoration: inherit; @@ -38,7 +38,7 @@ /* For safety - reset parent styles, that can break glyph codes*/ font-variant: normal; text-transform: none; - + /* fix buttons height, for twitter bootstrap */ line-height: 1em; @@ -52,14 +52,8 @@ /* Uncomment for 3D effect */ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } -.icon-hammer:before { content: '\e800'; } /* '' */ -.icon-info:before { content: '\e801'; } /* '' */ -.icon-logo-ynh-white:before { content: '\e802'; } /* '' */ -.icon-logo-ynh-white-1:before { content: '\e803'; } /* '' */ -.icon-ynh:before { content: '\e804'; } /* '' */ -.icon-heart-2:before { content: '\e8bc'; } /* '' */ -.icon-home:before { content: '\e8d5'; } /* '' */ -.icon-rss:before { content: '\f09e'; } /* '' */ -.icon-code:before { content: '\f121'; } /* '' */ -.icon-git:before { content: '\f1d3'; } /* '' */ -.icon-balance-scale:before { content: '\f24e'; } /* '' */ \ No newline at end of file +.icon-ynh:before { content: '\e800'; } /* '' */ +.icon-home:before { content: '\e801'; } /* '' */ +.icon-right-open:before { content: '\e802'; } /* '' */ +.icon-doc-text-inv:before { content: '\e803'; } /* '' */ +.icon-git:before { content: '\f1d3'; } /* '' */ \ No newline at end of file diff --git a/bibli/fontello/css/fontello-embedded.css.gz b/bibli/fontello/css/fontello-embedded.css.gz deleted file mode 100644 index 17a2e5e..0000000 Binary files a/bibli/fontello/css/fontello-embedded.css.gz and /dev/null differ diff --git a/bibli/fontello/css/fontello-ie7-codes.css b/bibli/fontello/css/fontello-ie7-codes.css old mode 100755 new mode 100644 index a2c9f9f..2c082bd --- a/bibli/fontello/css/fontello-ie7-codes.css +++ b/bibli/fontello/css/fontello-ie7-codes.css @@ -1,12 +1,6 @@ -.icon-hammer { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-info { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-logo-ynh-white { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-logo-ynh-white-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-ynh { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-heart-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-rss { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-code { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-git { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-balance-scale { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } \ No newline at end of file +.icon-ynh { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-right-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-doc-text-inv { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-git { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } \ No newline at end of file diff --git a/bibli/fontello/css/fontello-ie7-codes.css.gz b/bibli/fontello/css/fontello-ie7-codes.css.gz deleted file mode 100644 index 640b524..0000000 Binary files a/bibli/fontello/css/fontello-ie7-codes.css.gz and /dev/null differ diff --git a/bibli/fontello/css/fontello-ie7.css b/bibli/fontello/css/fontello-ie7.css old mode 100755 new mode 100644 index 32ea226..5474c98 --- a/bibli/fontello/css/fontello-ie7.css +++ b/bibli/fontello/css/fontello-ie7.css @@ -10,14 +10,8 @@ /* font-size: 120%; */ } -.icon-hammer { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-info { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-logo-ynh-white { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-logo-ynh-white-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-ynh { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-heart-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-rss { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-code { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-git { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-balance-scale { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } \ No newline at end of file +.icon-ynh { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-right-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-doc-text-inv { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-git { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } \ No newline at end of file diff --git a/bibli/fontello/css/fontello-ie7.css.gz b/bibli/fontello/css/fontello-ie7.css.gz deleted file mode 100644 index f3e126f..0000000 Binary files a/bibli/fontello/css/fontello-ie7.css.gz and /dev/null differ diff --git a/bibli/fontello/css/fontello.css b/bibli/fontello/css/fontello.css old mode 100755 new mode 100644 index d54a140..e040914 --- a/bibli/fontello/css/fontello.css +++ b/bibli/fontello/css/fontello.css @@ -1,11 +1,11 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?12448413'); - src: url('../font/fontello.eot?12448413#iefix') format('embedded-opentype'), - url('../font/fontello.woff2?12448413') format('woff2'), - url('../font/fontello.woff?12448413') format('woff'), - url('../font/fontello.ttf?12448413') format('truetype'), - url('../font/fontello.svg?12448413#fontello') format('svg'); + src: url('../font/fontello.eot?5025401'); + src: url('../font/fontello.eot?5025401#iefix') format('embedded-opentype'), + url('../font/fontello.woff2?5025401') format('woff2'), + url('../font/fontello.woff?5025401') format('woff'), + url('../font/fontello.ttf?5025401') format('truetype'), + url('../font/fontello.svg?5025401#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -15,7 +15,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?12448413#fontello') format('svg'); + src: url('../font/fontello.svg?5025401#fontello') format('svg'); } } */ @@ -24,7 +24,7 @@ font-family: "fontello"; font-style: normal; font-weight: normal; - speak: none; + speak: never; display: inline-block; text-decoration: inherit; @@ -55,14 +55,8 @@ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } -.icon-hammer:before { content: '\e800'; } /* '' */ -.icon-info:before { content: '\e801'; } /* '' */ -.icon-logo-ynh-white:before { content: '\e802'; } /* '' */ -.icon-logo-ynh-white-1:before { content: '\e803'; } /* '' */ -.icon-ynh:before { content: '\e804'; } /* '' */ -.icon-heart-2:before { content: '\e8bc'; } /* '' */ -.icon-home:before { content: '\e8d5'; } /* '' */ -.icon-rss:before { content: '\f09e'; } /* '' */ -.icon-code:before { content: '\f121'; } /* '' */ -.icon-git:before { content: '\f1d3'; } /* '' */ -.icon-balance-scale:before { content: '\f24e'; } /* '' */ \ No newline at end of file +.icon-ynh:before { content: '\e800'; } /* '' */ +.icon-home:before { content: '\e801'; } /* '' */ +.icon-right-open:before { content: '\e802'; } /* '' */ +.icon-doc-text-inv:before { content: '\e803'; } /* '' */ +.icon-git:before { content: '\f1d3'; } /* '' */ \ No newline at end of file diff --git a/bibli/fontello/css/fontello.css.gz b/bibli/fontello/css/fontello.css.gz deleted file mode 100644 index 4954a79..0000000 Binary files a/bibli/fontello/css/fontello.css.gz and /dev/null differ diff --git a/bibli/fontello/demo.html b/bibli/fontello/demo.html old mode 100755 new mode 100644 index 5c688dd..1704ce7 --- a/bibli/fontello/demo.html +++ b/bibli/fontello/demo.html @@ -229,11 +229,11 @@ body { } @font-face { font-family: 'fontello'; - src: url('./font/fontello.eot?75389355'); - src: url('./font/fontello.eot?75389355#iefix') format('embedded-opentype'), - url('./font/fontello.woff?75389355') format('woff'), - url('./font/fontello.ttf?75389355') format('truetype'), - url('./font/fontello.svg?75389355#fontello') format('svg'); + src: url('./font/fontello.eot?44739574'); + src: url('./font/fontello.eot?44739574#iefix') format('embedded-opentype'), + url('./font/fontello.woff?44739574') format('woff'), + url('./font/fontello.ttf?44739574') format('truetype'), + url('./font/fontello.svg?44739574#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -244,7 +244,7 @@ body { font-family: "fontello"; font-style: normal; font-weight: normal; - speak: none; + speak: never; display: inline-block; text-decoration: inherit; @@ -298,21 +298,13 @@ body {
-
icon-hammer0xe800
-
icon-info0xe801
-
icon-logo-ynh-white0xe802
-
icon-logo-ynh-white-10xe803
+
icon-ynh0xe800
+
icon-home0xe801
+
icon-right-open0xe802
+
icon-doc-text-inv0xe803
-
icon-ynh0xe804
-
icon-heart-20xe8bc
-
icon-home0xe8d5
-
icon-rss0xf09e
-
-
-
icon-code0xf121
icon-git0xf1d3
-
icon-balance-scale0xf24e
diff --git a/bibli/fontello/demo.html.gz b/bibli/fontello/demo.html.gz index 4f74219..49b706e 100644 Binary files a/bibli/fontello/demo.html.gz and b/bibli/fontello/demo.html.gz differ diff --git a/bibli/fontello/font/fontello.eot b/bibli/fontello/font/fontello.eot old mode 100755 new mode 100644 index 6437767..9d13843 Binary files a/bibli/fontello/font/fontello.eot and b/bibli/fontello/font/fontello.eot differ diff --git a/bibli/fontello/font/fontello.svg b/bibli/fontello/font/fontello.svg old mode 100755 new mode 100644 index f86c08d..2eaf48f --- a/bibli/fontello/font/fontello.svg +++ b/bibli/fontello/font/fontello.svg @@ -1,32 +1,20 @@ -Copyright (C) 2019 by original authors @ fontello.com +Copyright (C) 2020 by original authors @ fontello.com - + - + - + - - - - - - - - - - - + - - \ No newline at end of file diff --git a/bibli/fontello/font/fontello.ttf b/bibli/fontello/font/fontello.ttf old mode 100755 new mode 100644 index cf32f3c..8b34927 Binary files a/bibli/fontello/font/fontello.ttf and b/bibli/fontello/font/fontello.ttf differ diff --git a/bibli/fontello/font/fontello.woff b/bibli/fontello/font/fontello.woff old mode 100755 new mode 100644 index b4cc835..c8998bc Binary files a/bibli/fontello/font/fontello.woff and b/bibli/fontello/font/fontello.woff differ diff --git a/bibli/fontello/font/fontello.woff2 b/bibli/fontello/font/fontello.woff2 old mode 100755 new mode 100644 index f16a0f7..9d728e7 Binary files a/bibli/fontello/font/fontello.woff2 and b/bibli/fontello/font/fontello.woff2 differ diff --git a/bibli/gomez.css.gz b/bibli/gomez.css.gz deleted file mode 100644 index 974e6b5..0000000 Binary files a/bibli/gomez.css.gz and /dev/null differ diff --git a/bibli/gomez.css b/bibli/gomez/gomez.css similarity index 100% rename from bibli/gomez.css rename to bibli/gomez/gomez.css diff --git a/gomez.min.css b/bibli/gomez/gomez.min.css old mode 100755 new mode 100644 similarity index 100% rename from gomez.min.css rename to bibli/gomez/gomez.min.css diff --git a/bibli/lessphp/LICENSE b/bibli/lessphp/LICENSE deleted file mode 100755 index 3b307b5..0000000 --- a/bibli/lessphp/LICENSE +++ /dev/null @@ -1,660 +0,0 @@ -For ease of distribution, lessphp is under a dual license. -You are free to pick which one suits your needs. - - - - -MIT LICENSE - - - - -Copyright (c) 2014 Leaf Corcoran, http://leafo.net/lessphp - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - - -GPL VERSION 3 - - - - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - diff --git a/bibli/lessphp/README.md b/bibli/lessphp/README.md deleted file mode 100755 index d3d8716..0000000 --- a/bibli/lessphp/README.md +++ /dev/null @@ -1,96 +0,0 @@ -[![Build Status](https://travis-ci.org/leafo/lessphp.svg?branch=master)](https://travis-ci.org/leafo/lessphp) - -# lessphp v0.5.0 -### - -`lessphp` is a compiler for LESS written in PHP. The documentation is great, -so check it out: . - -Here's a quick tutorial: - -### How to use in your PHP project - -The only file required is `lessc.inc.php`, so copy that to your include directory. - -The typical flow of **lessphp** is to create a new instance of `lessc`, -configure it how you like, then tell it to compile something using one built in -compile methods. - -The `compile` method compiles a string of LESS code to CSS. - -```php -compile(".block { padding: 3 + 4px }"); -``` - -The `compileFile` method reads and compiles a file. It will either return the -result or write it to the path specified by an optional second argument. - -```php -compileFile("input.less"); -``` - -The `checkedCompile` method is like `compileFile`, but it only compiles if the output -file doesn't exist or it's older than the input file: - -```php -checkedCompile("input.less", "output.css"); -``` - -If there any problem compiling your code, an exception is thrown with a helpful message: - -```php -compile("invalid LESS } {"); -} catch (exception $e) { - echo "fatal error: " . $e->getMessage(); -} -``` - -The `lessc` object can be configured through an assortment of instance methods. -Some possible configuration options include [changing the output format][1], -[setting variables from PHP][2], and [controlling the preservation of -comments][3], writing [custom functions][4] and much more. It's all described -in [the documentation][0]. - - - [0]: http://leafo.net/lessphp/docs/ - [1]: http://leafo.net/lessphp/docs/#output_formatting - [2]: http://leafo.net/lessphp/docs/#setting_variables_from_php - [3]: http://leafo.net/lessphp/docs/#preserving_comments - [4]: http://leafo.net/lessphp/docs/#custom_functions - - -### How to use from the command line - -An additional script has been included to use the compiler from the command -line. In the simplest invocation, you specify an input file and the compiled -css is written to standard out: - - $ plessc input.less > output.css - -Using the -r flag, you can specify LESS code directly as an argument or, if -the argument is left off, from standard in: - - $ plessc -r "my less code here" - -Finally, by using the -w flag you can watch a specified input file and have it -compile as needed to the output file: - - $ plessc -w input-file output-file - -Errors from watch mode are written to standard out. - -The -f flag sets the [output formatter][1]. For example, to compress the -output run this: - - $ plessc -f=compressed myfile.less - -For more help, run `plessc --help` - diff --git a/bibli/lessphp/lessc.inc.php b/bibli/lessphp/lessc.inc.php deleted file mode 100755 index 90fac1a..0000000 --- a/bibli/lessphp/lessc.inc.php +++ /dev/null @@ -1,3880 +0,0 @@ - - * Licensed under MIT or GPLv3, see LICENSE - */ - - -/** - * The LESS compiler and parser. - * - * Converting LESS to CSS is a three stage process. The incoming file is parsed - * by `lessc_parser` into a syntax tree, then it is compiled into another tree - * representing the CSS structure by `lessc`. The CSS tree is fed into a - * formatter, like `lessc_formatter` which then outputs CSS as a string. - * - * During the first compile, all values are *reduced*, which means that their - * types are brought to the lowest form before being dump as strings. This - * handles math equations, variable dereferences, and the like. - * - * The `parse` function of `lessc` is the entry point. - * - * In summary: - * - * The `lessc` class creates an instance of the parser, feeds it LESS code, - * then transforms the resulting tree to a CSS tree. This class also holds the - * evaluation context, such as all available mixins and variables at any given - * time. - * - * The `lessc_parser` class is only concerned with parsing its input. - * - * The `lessc_formatter` takes a CSS tree, and dumps it to a formatted string, - * handling things like indentation. - */ -class lessc { - static public $VERSION = "v0.5.0"; - - static public $TRUE = array("keyword", "true"); - static public $FALSE = array("keyword", "false"); - - protected $libFunctions = array(); - protected $registeredVars = array(); - protected $preserveComments = false; - - public $vPrefix = '@'; // prefix of abstract properties - public $mPrefix = '$'; // prefix of abstract blocks - public $parentSelector = '&'; - - public $importDisabled = false; - public $importDir = ''; - - protected $numberPrecision = null; - - protected $allParsedFiles = array(); - - // set to the parser that generated the current line when compiling - // so we know how to create error messages - protected $sourceParser = null; - protected $sourceLoc = null; - - static protected $nextImportId = 0; // uniquely identify imports - - // attempts to find the path of an import url, returns null for css files - protected function findImport($url) { - foreach ((array)$this->importDir as $dir) { - $full = $dir.(substr($dir, -1) != '/' ? '/' : '').$url; - if ($this->fileExists($file = $full.'.less') || $this->fileExists($file = $full)) { - return $file; - } - } - - return null; - } - - protected function fileExists($name) { - return is_file($name); - } - - public static function compressList($items, $delim) { - if (!isset($items[1]) && isset($items[0])) return $items[0]; - else return array('list', $delim, $items); - } - - public static function preg_quote($what) { - return preg_quote($what, '/'); - } - - protected function tryImport($importPath, $parentBlock, $out) { - if ($importPath[0] == "function" && $importPath[1] == "url") { - $importPath = $this->flattenList($importPath[2]); - } - - $str = $this->coerceString($importPath); - if ($str === null) return false; - - $url = $this->compileValue($this->lib_e($str)); - - // don't import if it ends in css - if (substr_compare($url, '.css', -4, 4) === 0) return false; - - $realPath = $this->findImport($url); - - if ($realPath === null) return false; - - if ($this->importDisabled) { - return array(false, "/* import disabled */"); - } - - if (isset($this->allParsedFiles[realpath($realPath)])) { - return array(false, null); - } - - $this->addParsedFile($realPath); - $parser = $this->makeParser($realPath); - $root = $parser->parse(file_get_contents($realPath)); - - // set the parents of all the block props - foreach ($root->props as $prop) { - if ($prop[0] == "block") { - $prop[1]->parent = $parentBlock; - } - } - - // copy mixins into scope, set their parents - // bring blocks from import into current block - // TODO: need to mark the source parser these came from this file - foreach ($root->children as $childName => $child) { - if (isset($parentBlock->children[$childName])) { - $parentBlock->children[$childName] = array_merge( - $parentBlock->children[$childName], - $child); - } else { - $parentBlock->children[$childName] = $child; - } - } - - $pi = pathinfo($realPath); - $dir = $pi["dirname"]; - - list($top, $bottom) = $this->sortProps($root->props, true); - $this->compileImportedProps($top, $parentBlock, $out, $parser, $dir); - - return array(true, $bottom, $parser, $dir); - } - - protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir) { - $oldSourceParser = $this->sourceParser; - - $oldImport = $this->importDir; - - // TODO: this is because the importDir api is stupid - $this->importDir = (array)$this->importDir; - array_unshift($this->importDir, $importDir); - - foreach ($props as $prop) { - $this->compileProp($prop, $block, $out); - } - - $this->importDir = $oldImport; - $this->sourceParser = $oldSourceParser; - } - - /** - * Recursively compiles a block. - * - * A block is analogous to a CSS block in most cases. A single LESS document - * is encapsulated in a block when parsed, but it does not have parent tags - * so all of it's children appear on the root level when compiled. - * - * Blocks are made up of props and children. - * - * Props are property instructions, array tuples which describe an action - * to be taken, eg. write a property, set a variable, mixin a block. - * - * The children of a block are just all the blocks that are defined within. - * This is used to look up mixins when performing a mixin. - * - * Compiling the block involves pushing a fresh environment on the stack, - * and iterating through the props, compiling each one. - * - * See lessc::compileProp() - * - */ - protected function compileBlock($block) { - switch ($block->type) { - case "root": - $this->compileRoot($block); - break; - case null: - $this->compileCSSBlock($block); - break; - case "media": - $this->compileMedia($block); - break; - case "directive": - $name = "@" . $block->name; - if (!empty($block->value)) { - $name .= " " . $this->compileValue($this->reduce($block->value)); - } - - $this->compileNestedBlock($block, array($name)); - break; - default: - $this->throwError("unknown block type: $block->type\n"); - } - } - - protected function compileCSSBlock($block) { - $env = $this->pushEnv(); - - $selectors = $this->compileSelectors($block->tags); - $env->selectors = $this->multiplySelectors($selectors); - $out = $this->makeOutputBlock(null, $env->selectors); - - $this->scope->children[] = $out; - $this->compileProps($block, $out); - - $block->scope = $env; // mixins carry scope with them! - $this->popEnv(); - } - - protected function compileMedia($media) { - $env = $this->pushEnv($media); - $parentScope = $this->mediaParent($this->scope); - - $query = $this->compileMediaQuery($this->multiplyMedia($env)); - - $this->scope = $this->makeOutputBlock($media->type, array($query)); - $parentScope->children[] = $this->scope; - - $this->compileProps($media, $this->scope); - - if (count($this->scope->lines) > 0) { - $orphanSelelectors = $this->findClosestSelectors(); - if (!is_null($orphanSelelectors)) { - $orphan = $this->makeOutputBlock(null, $orphanSelelectors); - $orphan->lines = $this->scope->lines; - array_unshift($this->scope->children, $orphan); - $this->scope->lines = array(); - } - } - - $this->scope = $this->scope->parent; - $this->popEnv(); - } - - protected function mediaParent($scope) { - while (!empty($scope->parent)) { - if (!empty($scope->type) && $scope->type != "media") { - break; - } - $scope = $scope->parent; - } - - return $scope; - } - - protected function compileNestedBlock($block, $selectors) { - $this->pushEnv($block); - $this->scope = $this->makeOutputBlock($block->type, $selectors); - $this->scope->parent->children[] = $this->scope; - - $this->compileProps($block, $this->scope); - - $this->scope = $this->scope->parent; - $this->popEnv(); - } - - protected function compileRoot($root) { - $this->pushEnv(); - $this->scope = $this->makeOutputBlock($root->type); - $this->compileProps($root, $this->scope); - $this->popEnv(); - } - - protected function compileProps($block, $out) { - foreach ($this->sortProps($block->props) as $prop) { - $this->compileProp($prop, $block, $out); - } - $out->lines = $this->deduplicate($out->lines); - } - - /** - * Deduplicate lines in a block. Comments are not deduplicated. If a - * duplicate rule is detected, the comments immediately preceding each - * occurence are consolidated. - */ - protected function deduplicate($lines) { - $unique = array(); - $comments = array(); - - foreach ($lines as $line) { - if (strpos($line, '/*') === 0) { - $comments[] = $line; - continue; - } - if (!in_array($line, $unique)) { - $unique[] = $line; - } - array_splice($unique, array_search($line, $unique), 0, $comments); - $comments = array(); - } - return array_merge($unique, $comments); - } - - protected function sortProps($props, $split = false) { - $vars = array(); - $imports = array(); - $other = array(); - $stack = array(); - - foreach ($props as $prop) { - switch ($prop[0]) { - case "comment": - $stack[] = $prop; - break; - case "assign": - $stack[] = $prop; - if (isset($prop[1][0]) && $prop[1][0] == $this->vPrefix) { - $vars = array_merge($vars, $stack); - } else { - $other = array_merge($other, $stack); - } - $stack = array(); - break; - case "import": - $id = self::$nextImportId++; - $prop[] = $id; - $stack[] = $prop; - $imports = array_merge($imports, $stack); - $other[] = array("import_mixin", $id); - $stack = array(); - break; - default: - $stack[] = $prop; - $other = array_merge($other, $stack); - $stack = array(); - break; - } - } - $other = array_merge($other, $stack); - - if ($split) { - return array(array_merge($imports, $vars), $other); - } else { - return array_merge($imports, $vars, $other); - } - } - - protected function compileMediaQuery($queries) { - $compiledQueries = array(); - foreach ($queries as $query) { - $parts = array(); - foreach ($query as $q) { - switch ($q[0]) { - case "mediaType": - $parts[] = implode(" ", array_slice($q, 1)); - break; - case "mediaExp": - if (isset($q[2])) { - $parts[] = "($q[1]: " . - $this->compileValue($this->reduce($q[2])) . ")"; - } else { - $parts[] = "($q[1])"; - } - break; - case "variable": - $parts[] = $this->compileValue($this->reduce($q)); - break; - } - } - - if (count($parts) > 0) { - $compiledQueries[] = implode(" and ", $parts); - } - } - - $out = "@media"; - if (!empty($parts)) { - $out .= " " . - implode($this->formatter->selectorSeparator, $compiledQueries); - } - return $out; - } - - protected function multiplyMedia($env, $childQueries = null) { - if (is_null($env) || - !empty($env->block->type) && $env->block->type != "media" - ) { - return $childQueries; - } - - // plain old block, skip - if (empty($env->block->type)) { - return $this->multiplyMedia($env->parent, $childQueries); - } - - $out = array(); - $queries = $env->block->queries; - if (is_null($childQueries)) { - $out = $queries; - } else { - foreach ($queries as $parent) { - foreach ($childQueries as $child) { - $out[] = array_merge($parent, $child); - } - } - } - - return $this->multiplyMedia($env->parent, $out); - } - - protected function expandParentSelectors(&$tag, $replace) { - $parts = explode("$&$", $tag); - $count = 0; - foreach ($parts as &$part) { - $part = str_replace($this->parentSelector, $replace, $part, $c); - $count += $c; - } - $tag = implode($this->parentSelector, $parts); - return $count; - } - - protected function findClosestSelectors() { - $env = $this->env; - $selectors = null; - while ($env !== null) { - if (isset($env->selectors)) { - $selectors = $env->selectors; - break; - } - $env = $env->parent; - } - - return $selectors; - } - - - // multiply $selectors against the nearest selectors in env - protected function multiplySelectors($selectors) { - // find parent selectors - - $parentSelectors = $this->findClosestSelectors(); - if (is_null($parentSelectors)) { - // kill parent reference in top level selector - foreach ($selectors as &$s) { - $this->expandParentSelectors($s, ""); - } - - return $selectors; - } - - $out = array(); - foreach ($parentSelectors as $parent) { - foreach ($selectors as $child) { - $count = $this->expandParentSelectors($child, $parent); - - // don't prepend the parent tag if & was used - if ($count > 0) { - $out[] = trim($child); - } else { - $out[] = trim($parent . ' ' . $child); - } - } - } - - return $out; - } - - // reduces selector expressions - protected function compileSelectors($selectors) { - $out = array(); - - foreach ($selectors as $s) { - if (is_array($s)) { - list(, $value) = $s; - $out[] = trim($this->compileValue($this->reduce($value))); - } else { - $out[] = $s; - } - } - - return $out; - } - - protected function eq($left, $right) { - return $left == $right; - } - - protected function patternMatch($block, $orderedArgs, $keywordArgs) { - // match the guards if it has them - // any one of the groups must have all its guards pass for a match - if (!empty($block->guards)) { - $groupPassed = false; - foreach ($block->guards as $guardGroup) { - foreach ($guardGroup as $guard) { - $this->pushEnv(); - $this->zipSetArgs($block->args, $orderedArgs, $keywordArgs); - - $negate = false; - if ($guard[0] == "negate") { - $guard = $guard[1]; - $negate = true; - } - - $passed = $this->reduce($guard) == self::$TRUE; - if ($negate) $passed = !$passed; - - $this->popEnv(); - - if ($passed) { - $groupPassed = true; - } else { - $groupPassed = false; - break; - } - } - - if ($groupPassed) break; - } - - if (!$groupPassed) { - return false; - } - } - - if (empty($block->args)) { - return $block->isVararg || empty($orderedArgs) && empty($keywordArgs); - } - - $remainingArgs = $block->args; - if ($keywordArgs) { - $remainingArgs = array(); - foreach ($block->args as $arg) { - if ($arg[0] == "arg" && isset($keywordArgs[$arg[1]])) { - continue; - } - - $remainingArgs[] = $arg; - } - } - - $i = -1; // no args - // try to match by arity or by argument literal - foreach ($remainingArgs as $i => $arg) { - switch ($arg[0]) { - case "lit": - if (empty($orderedArgs[$i]) || !$this->eq($arg[1], $orderedArgs[$i])) { - return false; - } - break; - case "arg": - // no arg and no default value - if (!isset($orderedArgs[$i]) && !isset($arg[2])) { - return false; - } - break; - case "rest": - $i--; // rest can be empty - break 2; - } - } - - if ($block->isVararg) { - return true; // not having enough is handled above - } else { - $numMatched = $i + 1; - // greater than because default values always match - return $numMatched >= count($orderedArgs); - } - } - - protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip=array()) { - $matches = null; - foreach ($blocks as $block) { - // skip seen blocks that don't have arguments - if (isset($skip[$block->id]) && !isset($block->args)) { - continue; - } - - if ($this->patternMatch($block, $orderedArgs, $keywordArgs)) { - $matches[] = $block; - } - } - - return $matches; - } - - // attempt to find blocks matched by path and args - protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen=array()) { - if ($searchIn == null) return null; - if (isset($seen[$searchIn->id])) return null; - $seen[$searchIn->id] = true; - - $name = $path[0]; - - if (isset($searchIn->children[$name])) { - $blocks = $searchIn->children[$name]; - if (count($path) == 1) { - $matches = $this->patternMatchAll($blocks, $orderedArgs, $keywordArgs, $seen); - if (!empty($matches)) { - // This will return all blocks that match in the closest - // scope that has any matching block, like lessjs - return $matches; - } - } else { - $matches = array(); - foreach ($blocks as $subBlock) { - $subMatches = $this->findBlocks($subBlock, - array_slice($path, 1), $orderedArgs, $keywordArgs, $seen); - - if (!is_null($subMatches)) { - foreach ($subMatches as $sm) { - $matches[] = $sm; - } - } - } - - return count($matches) > 0 ? $matches : null; - } - } - if ($searchIn->parent === $searchIn) return null; - return $this->findBlocks($searchIn->parent, $path, $orderedArgs, $keywordArgs, $seen); - } - - // sets all argument names in $args to either the default value - // or the one passed in through $values - protected function zipSetArgs($args, $orderedValues, $keywordValues) { - $assignedValues = array(); - - $i = 0; - foreach ($args as $a) { - if ($a[0] == "arg") { - if (isset($keywordValues[$a[1]])) { - // has keyword arg - $value = $keywordValues[$a[1]]; - } elseif (isset($orderedValues[$i])) { - // has ordered arg - $value = $orderedValues[$i]; - $i++; - } elseif (isset($a[2])) { - // has default value - $value = $a[2]; - } else { - $this->throwError("Failed to assign arg " . $a[1]); - $value = null; // :( - } - - $value = $this->reduce($value); - $this->set($a[1], $value); - $assignedValues[] = $value; - } else { - // a lit - $i++; - } - } - - // check for a rest - $last = end($args); - if ($last[0] == "rest") { - $rest = array_slice($orderedValues, count($args) - 1); - $this->set($last[1], $this->reduce(array("list", " ", $rest))); - } - - // wow is this the only true use of PHP's + operator for arrays? - $this->env->arguments = $assignedValues + $orderedValues; - } - - // compile a prop and update $lines or $blocks appropriately - protected function compileProp($prop, $block, $out) { - // set error position context - $this->sourceLoc = isset($prop[-1]) ? $prop[-1] : -1; - - switch ($prop[0]) { - case 'assign': - list(, $name, $value) = $prop; - if ($name[0] == $this->vPrefix) { - $this->set($name, $value); - } else { - $out->lines[] = $this->formatter->property($name, - $this->compileValue($this->reduce($value))); - } - break; - case 'block': - list(, $child) = $prop; - $this->compileBlock($child); - break; - case 'mixin': - list(, $path, $args, $suffix) = $prop; - - $orderedArgs = array(); - $keywordArgs = array(); - foreach ((array)$args as $arg) { - $argval = null; - switch ($arg[0]) { - case "arg": - if (!isset($arg[2])) { - $orderedArgs[] = $this->reduce(array("variable", $arg[1])); - } else { - $keywordArgs[$arg[1]] = $this->reduce($arg[2]); - } - break; - - case "lit": - $orderedArgs[] = $this->reduce($arg[1]); - break; - default: - $this->throwError("Unknown arg type: " . $arg[0]); - } - } - - $mixins = $this->findBlocks($block, $path, $orderedArgs, $keywordArgs); - - if ($mixins === null) { - $this->throwError("{$prop[1][0]} is undefined"); - } - - foreach ($mixins as $mixin) { - if ($mixin === $block && !$orderedArgs) { - continue; - } - - $haveScope = false; - if (isset($mixin->parent->scope)) { - $haveScope = true; - $mixinParentEnv = $this->pushEnv(); - $mixinParentEnv->storeParent = $mixin->parent->scope; - } - - $haveArgs = false; - if (isset($mixin->args)) { - $haveArgs = true; - $this->pushEnv(); - $this->zipSetArgs($mixin->args, $orderedArgs, $keywordArgs); - } - - $oldParent = $mixin->parent; - if ($mixin != $block) $mixin->parent = $block; - - foreach ($this->sortProps($mixin->props) as $subProp) { - if ($suffix !== null && - $subProp[0] == "assign" && - is_string($subProp[1]) && - $subProp[1][0] != $this->vPrefix - ) { - $subProp[2] = array( - 'list', ' ', - array($subProp[2], array('keyword', $suffix)) - ); - } - - $this->compileProp($subProp, $mixin, $out); - } - - $mixin->parent = $oldParent; - - if ($haveArgs) $this->popEnv(); - if ($haveScope) $this->popEnv(); - } - - break; - case 'raw': - $out->lines[] = $prop[1]; - break; - case "directive": - list(, $name, $value) = $prop; - $out->lines[] = "@$name " . $this->compileValue($this->reduce($value)).';'; - break; - case "comment": - $out->lines[] = $prop[1]; - break; - case "import": - list(, $importPath, $importId) = $prop; - $importPath = $this->reduce($importPath); - - if (!isset($this->env->imports)) { - $this->env->imports = array(); - } - - $result = $this->tryImport($importPath, $block, $out); - - $this->env->imports[$importId] = $result === false ? - array(false, "@import " . $this->compileValue($importPath).";") : - $result; - - break; - case "import_mixin": - list(,$importId) = $prop; - $import = $this->env->imports[$importId]; - if ($import[0] === false) { - if (isset($import[1])) { - $out->lines[] = $import[1]; - } - } else { - list(, $bottom, $parser, $importDir) = $import; - $this->compileImportedProps($bottom, $block, $out, $parser, $importDir); - } - - break; - default: - $this->throwError("unknown op: {$prop[0]}\n"); - } - } - - - /** - * Compiles a primitive value into a CSS property value. - * - * Values in lessphp are typed by being wrapped in arrays, their format is - * typically: - * - * array(type, contents [, additional_contents]*) - * - * The input is expected to be reduced. This function will not work on - * things like expressions and variables. - */ - public function compileValue($value) { - switch ($value[0]) { - case 'list': - // [1] - delimiter - // [2] - array of values - return implode($value[1], array_map(array($this, 'compileValue'), $value[2])); - case 'raw_color': - if (!empty($this->formatter->compressColors)) { - return $this->compileValue($this->coerceColor($value)); - } - return $value[1]; - case 'keyword': - // [1] - the keyword - return $value[1]; - case 'number': - list(, $num, $unit) = $value; - // [1] - the number - // [2] - the unit - if ($this->numberPrecision !== null) { - $num = round($num, $this->numberPrecision); - } - return $num . $unit; - case 'string': - // [1] - contents of string (includes quotes) - list(, $delim, $content) = $value; - foreach ($content as &$part) { - if (is_array($part)) { - $part = $this->compileValue($part); - } - } - return $delim . implode($content) . $delim; - case 'color': - // [1] - red component (either number or a %) - // [2] - green component - // [3] - blue component - // [4] - optional alpha component - list(, $r, $g, $b) = $value; - $r = round($r); - $g = round($g); - $b = round($b); - - if (count($value) == 5 && $value[4] != 1) { // rgba - return 'rgba('.$r.','.$g.','.$b.','.$value[4].')'; - } - - $h = sprintf("#%02x%02x%02x", $r, $g, $b); - - if (!empty($this->formatter->compressColors)) { - // Converting hex color to short notation (e.g. #003399 to #039) - if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6]) { - $h = '#' . $h[1] . $h[3] . $h[5]; - } - } - - return $h; - - case 'function': - list(, $name, $args) = $value; - return $name.'('.$this->compileValue($args).')'; - default: // assumed to be unit - $this->throwError("unknown value type: $value[0]"); - } - } - - protected function lib_pow($args) { - list($base, $exp) = $this->assertArgs($args, 2, "pow"); - return pow($this->assertNumber($base), $this->assertNumber($exp)); - } - - protected function lib_pi() { - return pi(); - } - - protected function lib_mod($args) { - list($a, $b) = $this->assertArgs($args, 2, "mod"); - return $this->assertNumber($a) % $this->assertNumber($b); - } - - protected function lib_tan($num) { - return tan($this->assertNumber($num)); - } - - protected function lib_sin($num) { - return sin($this->assertNumber($num)); - } - - protected function lib_cos($num) { - return cos($this->assertNumber($num)); - } - - protected function lib_atan($num) { - $num = atan($this->assertNumber($num)); - return array("number", $num, "rad"); - } - - protected function lib_asin($num) { - $num = asin($this->assertNumber($num)); - return array("number", $num, "rad"); - } - - protected function lib_acos($num) { - $num = acos($this->assertNumber($num)); - return array("number", $num, "rad"); - } - - protected function lib_sqrt($num) { - return sqrt($this->assertNumber($num)); - } - - protected function lib_extract($value) { - list($list, $idx) = $this->assertArgs($value, 2, "extract"); - $idx = $this->assertNumber($idx); - // 1 indexed - if ($list[0] == "list" && isset($list[2][$idx - 1])) { - return $list[2][$idx - 1]; - } - } - - protected function lib_isnumber($value) { - return $this->toBool($value[0] == "number"); - } - - protected function lib_isstring($value) { - return $this->toBool($value[0] == "string"); - } - - protected function lib_iscolor($value) { - return $this->toBool($this->coerceColor($value)); - } - - protected function lib_iskeyword($value) { - return $this->toBool($value[0] == "keyword"); - } - - protected function lib_ispixel($value) { - return $this->toBool($value[0] == "number" && $value[2] == "px"); - } - - protected function lib_ispercentage($value) { - return $this->toBool($value[0] == "number" && $value[2] == "%"); - } - - protected function lib_isem($value) { - return $this->toBool($value[0] == "number" && $value[2] == "em"); - } - - protected function lib_isrem($value) { - return $this->toBool($value[0] == "number" && $value[2] == "rem"); - } - - protected function lib_rgbahex($color) { - $color = $this->coerceColor($color); - if (is_null($color)) { - $this->throwError("color expected for rgbahex"); - } - - return sprintf("#%02x%02x%02x%02x", - isset($color[4]) ? $color[4] * 255 : 255, - $color[1], - $color[2], - $color[3] - ); - } - - protected function lib_argb($color){ - return $this->lib_rgbahex($color); - } - - /** - * Given an url, decide whether to output a regular link or the base64-encoded contents of the file - * - * @param array $value either an argument list (two strings) or a single string - * @return string formatted url(), either as a link or base64-encoded - */ - protected function lib_data_uri($value) { - $mime = ($value[0] === 'list') ? $value[2][0][2] : null; - $url = ($value[0] === 'list') ? $value[2][1][2][0] : $value[2][0]; - - $fullpath = $this->findImport($url); - - if ($fullpath && ($fsize = filesize($fullpath)) !== false) { - // IE8 can't handle data uris larger than 32KB - if ($fsize/1024 < 32) { - if (is_null($mime)) { - if (class_exists('finfo')) { // php 5.3+ - $finfo = new finfo(FILEINFO_MIME); - $mime = explode('; ', $finfo->file($fullpath)); - $mime = $mime[0]; - } elseif (function_exists('mime_content_type')) { // PHP 5.2 - $mime = mime_content_type($fullpath); - } - } - - if (!is_null($mime)) // fallback if the mime type is still unknown - $url = sprintf('data:%s;base64,%s', $mime, base64_encode(file_get_contents($fullpath))); - } - } - - return 'url("'.$url.'")'; - } - - // utility func to unquote a string - protected function lib_e($arg) { - switch ($arg[0]) { - case "list": - $items = $arg[2]; - if (isset($items[0])) { - return $this->lib_e($items[0]); - } - $this->throwError("unrecognised input"); - case "string": - $arg[1] = ""; - return $arg; - case "keyword": - return $arg; - default: - return array("keyword", $this->compileValue($arg)); - } - } - - protected function lib__sprintf($args) { - if ($args[0] != "list") return $args; - $values = $args[2]; - $string = array_shift($values); - $template = $this->compileValue($this->lib_e($string)); - - $i = 0; - if (preg_match_all('/%[dsa]/', $template, $m)) { - foreach ($m[0] as $match) { - $val = isset($values[$i]) ? - $this->reduce($values[$i]) : array('keyword', ''); - - // lessjs compat, renders fully expanded color, not raw color - if ($color = $this->coerceColor($val)) { - $val = $color; - } - - $i++; - $rep = $this->compileValue($this->lib_e($val)); - $template = preg_replace('/'.self::preg_quote($match).'/', - $rep, $template, 1); - } - } - - $d = $string[0] == "string" ? $string[1] : '"'; - return array("string", $d, array($template)); - } - - protected function lib_floor($arg) { - $value = $this->assertNumber($arg); - return array("number", floor($value), $arg[2]); - } - - protected function lib_ceil($arg) { - $value = $this->assertNumber($arg); - return array("number", ceil($value), $arg[2]); - } - - protected function lib_round($arg) { - if ($arg[0] != "list") { - $value = $this->assertNumber($arg); - return array("number", round($value), $arg[2]); - } else { - $value = $this->assertNumber($arg[2][0]); - $precision = $this->assertNumber($arg[2][1]); - return array("number", round($value, $precision), $arg[2][0][2]); - } - } - - protected function lib_unit($arg) { - if ($arg[0] == "list") { - list($number, $newUnit) = $arg[2]; - return array("number", $this->assertNumber($number), - $this->compileValue($this->lib_e($newUnit))); - } else { - return array("number", $this->assertNumber($arg), ""); - } - } - - /** - * Helper function to get arguments for color manipulation functions. - * takes a list that contains a color like thing and a percentage - */ - public function colorArgs($args) { - if ($args[0] != 'list' || count($args[2]) < 2) { - return array(array('color', 0, 0, 0), 0); - } - list($color, $delta) = $args[2]; - $color = $this->assertColor($color); - $delta = floatval($delta[1]); - - return array($color, $delta); - } - - protected function lib_darken($args) { - list($color, $delta) = $this->colorArgs($args); - - $hsl = $this->toHSL($color); - $hsl[3] = $this->clamp($hsl[3] - $delta, 100); - return $this->toRGB($hsl); - } - - protected function lib_lighten($args) { - list($color, $delta) = $this->colorArgs($args); - - $hsl = $this->toHSL($color); - $hsl[3] = $this->clamp($hsl[3] + $delta, 100); - return $this->toRGB($hsl); - } - - protected function lib_saturate($args) { - list($color, $delta) = $this->colorArgs($args); - - $hsl = $this->toHSL($color); - $hsl[2] = $this->clamp($hsl[2] + $delta, 100); - return $this->toRGB($hsl); - } - - protected function lib_desaturate($args) { - list($color, $delta) = $this->colorArgs($args); - - $hsl = $this->toHSL($color); - $hsl[2] = $this->clamp($hsl[2] - $delta, 100); - return $this->toRGB($hsl); - } - - protected function lib_spin($args) { - list($color, $delta) = $this->colorArgs($args); - - $hsl = $this->toHSL($color); - - $hsl[1] = $hsl[1] + $delta % 360; - if ($hsl[1] < 0) { - $hsl[1] += 360; - } - - return $this->toRGB($hsl); - } - - protected function lib_fadeout($args) { - list($color, $delta) = $this->colorArgs($args); - $color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta/100); - return $color; - } - - protected function lib_fadein($args) { - list($color, $delta) = $this->colorArgs($args); - $color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta/100); - return $color; - } - - protected function lib_hue($color) { - $hsl = $this->toHSL($this->assertColor($color)); - return round($hsl[1]); - } - - protected function lib_saturation($color) { - $hsl = $this->toHSL($this->assertColor($color)); - return round($hsl[2]); - } - - protected function lib_lightness($color) { - $hsl = $this->toHSL($this->assertColor($color)); - return round($hsl[3]); - } - - // get the alpha of a color - // defaults to 1 for non-colors or colors without an alpha - protected function lib_alpha($value) { - if (!is_null($color = $this->coerceColor($value))) { - return isset($color[4]) ? $color[4] : 1; - } - } - - // set the alpha of the color - protected function lib_fade($args) { - list($color, $alpha) = $this->colorArgs($args); - $color[4] = $this->clamp($alpha / 100.0); - return $color; - } - - protected function lib_percentage($arg) { - $num = $this->assertNumber($arg); - return array("number", $num*100, "%"); - } - - /** - * Mix color with white in variable proportion. - * - * It is the same as calling `mix(#ffffff, @color, @weight)`. - * - * tint(@color, [@weight: 50%]); - * - * http://lesscss.org/functions/#color-operations-tint - * - * @return array Color - */ - protected function lib_tint($args) { - $white = ['color', 255, 255, 255]; - if ($args[0] == 'color') { - return $this->lib_mix([ 'list', ',', [$white, $args] ]); - } elseif ($args[0] == "list" && count($args[2]) == 2) { - return $this->lib_mix([ $args[0], $args[1], [$white, $args[2][0], $args[2][1]] ]); - } else { - $this->throwError("tint expects (color, weight)"); - } - } - - /** - * Mix color with black in variable proportion. - * - * It is the same as calling `mix(#000000, @color, @weight)` - * - * shade(@color, [@weight: 50%]); - * - * http://lesscss.org/functions/#color-operations-shade - * - * @return array Color - */ - protected function lib_shade($args) { - $black = ['color', 0, 0, 0]; - if ($args[0] == 'color') { - return $this->lib_mix([ 'list', ',', [$black, $args] ]); - } elseif ($args[0] == "list" && count($args[2]) == 2) { - return $this->lib_mix([ $args[0], $args[1], [$black, $args[2][0], $args[2][1]] ]); - } else { - $this->throwError("shade expects (color, weight)"); - } - } - - // mixes two colors by weight - // mix(@color1, @color2, [@weight: 50%]); - // http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method - protected function lib_mix($args) { - if ($args[0] != "list" || count($args[2]) < 2) - $this->throwError("mix expects (color1, color2, weight)"); - - list($first, $second) = $args[2]; - $first = $this->assertColor($first); - $second = $this->assertColor($second); - - $first_a = $this->lib_alpha($first); - $second_a = $this->lib_alpha($second); - - if (isset($args[2][2])) { - $weight = $args[2][2][1] / 100.0; - } else { - $weight = 0.5; - } - - $w = $weight * 2 - 1; - $a = $first_a - $second_a; - - $w1 = (($w * $a == -1 ? $w : ($w + $a)/(1 + $w * $a)) + 1) / 2.0; - $w2 = 1.0 - $w1; - - $new = array('color', - $w1 * $first[1] + $w2 * $second[1], - $w1 * $first[2] + $w2 * $second[2], - $w1 * $first[3] + $w2 * $second[3], - ); - - if ($first_a != 1.0 || $second_a != 1.0) { - $new[] = $first_a * $weight + $second_a * ($weight - 1); - } - - return $this->fixColor($new); - } - - protected function lib_contrast($args) { - $darkColor = array('color', 0, 0, 0); - $lightColor = array('color', 255, 255, 255); - $threshold = 0.43; - - if ( $args[0] == 'list' ) { - $inputColor = ( isset($args[2][0]) ) ? $this->assertColor($args[2][0]) : $lightColor; - $darkColor = ( isset($args[2][1]) ) ? $this->assertColor($args[2][1]) : $darkColor; - $lightColor = ( isset($args[2][2]) ) ? $this->assertColor($args[2][2]) : $lightColor; - $threshold = ( isset($args[2][3]) ) ? $this->assertNumber($args[2][3]) : $threshold; - } - else { - $inputColor = $this->assertColor($args); - } - - $inputColor = $this->coerceColor($inputColor); - $darkColor = $this->coerceColor($darkColor); - $lightColor = $this->coerceColor($lightColor); - - //Figure out which is actually light and dark! - if ( $this->toLuma($darkColor) > $this->toLuma($lightColor) ) { - $t = $lightColor; - $lightColor = $darkColor; - $darkColor = $t; - } - - $inputColor_alpha = $this->lib_alpha($inputColor); - if ( ( $this->toLuma($inputColor) * $inputColor_alpha) < $threshold) { - return $lightColor; - } - return $darkColor; - } - - private function toLuma($color) { - list(, $r, $g, $b) = $this->coerceColor($color); - - $r = $r / 255; - $g = $g / 255; - $b = $b / 255; - - $r = ($r <= 0.03928) ? $r / 12.92 : pow((($r + 0.055) / 1.055), 2.4); - $g = ($g <= 0.03928) ? $g / 12.92 : pow((($g + 0.055) / 1.055), 2.4); - $b = ($b <= 0.03928) ? $b / 12.92 : pow((($b + 0.055) / 1.055), 2.4); - - return (0.2126 * $r) + (0.7152 * $g) + (0.0722 * $b); - } - - protected function lib_luma($color) { - return array("number", round($this->toLuma($color) * 100, 8), "%"); - } - - - public function assertColor($value, $error = "expected color value") { - $color = $this->coerceColor($value); - if (is_null($color)) $this->throwError($error); - return $color; - } - - public function assertNumber($value, $error = "expecting number") { - if ($value[0] == "number") return $value[1]; - $this->throwError($error); - } - - public function assertArgs($value, $expectedArgs, $name="") { - if ($expectedArgs == 1) { - return $value; - } else { - if ($value[0] !== "list" || $value[1] != ",") $this->throwError("expecting list"); - $values = $value[2]; - $numValues = count($values); - if ($expectedArgs != $numValues) { - if ($name) { - $name = $name . ": "; - } - - $this->throwError("${name}expecting $expectedArgs arguments, got $numValues"); - } - - return $values; - } - } - - protected function toHSL($color) { - if ($color[0] === 'hsl') { - return $color; - } - - $r = $color[1] / 255; - $g = $color[2] / 255; - $b = $color[3] / 255; - - $min = min($r, $g, $b); - $max = max($r, $g, $b); - - $L = ($min + $max) / 2; - if ($min == $max) { - $S = $H = 0; - } else { - if ($L < 0.5) { - $S = ($max - $min) / ($max + $min); - } else { - $S = ($max - $min) / (2.0 - $max - $min); - } - if ($r == $max) { - $H = ($g - $b) / ($max - $min); - } elseif ($g == $max) { - $H = 2.0 + ($b - $r) / ($max - $min); - } elseif ($b == $max) { - $H = 4.0 + ($r - $g) / ($max - $min); - } - - } - - $out = array('hsl', - ($H < 0 ? $H + 6 : $H)*60, - $S * 100, - $L * 100, - ); - - if (count($color) > 4) { - // copy alpha - $out[] = $color[4]; - } - return $out; - } - - protected function toRGB_helper($comp, $temp1, $temp2) { - if ($comp < 0) { - $comp += 1.0; - } elseif ($comp > 1) { - $comp -= 1.0; - } - - if (6 * $comp < 1) { - return $temp1 + ($temp2 - $temp1) * 6 * $comp; - } - if (2 * $comp < 1) { - return $temp2; - } - if (3 * $comp < 2) { - return $temp1 + ($temp2 - $temp1)*((2/3) - $comp) * 6; - } - - return $temp1; - } - - /** - * Converts a hsl array into a color value in rgb. - * Expects H to be in range of 0 to 360, S and L in 0 to 100 - */ - protected function toRGB($color) { - if ($color[0] === 'color') { - return $color; - } - - $H = $color[1] / 360; - $S = $color[2] / 100; - $L = $color[3] / 100; - - if ($S == 0) { - $r = $g = $b = $L; - } else { - $temp2 = $L < 0.5 ? - $L * (1.0 + $S) : - $L + $S - $L * $S; - - $temp1 = 2.0 * $L - $temp2; - - $r = $this->toRGB_helper($H + 1/3, $temp1, $temp2); - $g = $this->toRGB_helper($H, $temp1, $temp2); - $b = $this->toRGB_helper($H - 1/3, $temp1, $temp2); - } - - // $out = array('color', round($r*255), round($g*255), round($b*255)); - $out = array('color', $r*255, $g*255, $b*255); - if (count($color) > 4) { - // copy alpha - $out[] = $color[4]; - } - return $out; - } - - protected function clamp($v, $max = 1, $min = 0) { - return min($max, max($min, $v)); - } - - /** - * Convert the rgb, rgba, hsl color literals of function type - * as returned by the parser into values of color type. - */ - protected function funcToColor($func) { - $fname = $func[1]; - if ($func[2][0] != 'list') { - // need a list of arguments - return false; - } - $rawComponents = $func[2][2]; - - if ($fname == 'hsl' || $fname == 'hsla') { - $hsl = array('hsl'); - $i = 0; - foreach ($rawComponents as $c) { - $val = $this->reduce($c); - $val = isset($val[1]) ? floatval($val[1]) : 0; - - if ($i == 0) { - $clamp = 360; - } elseif ($i < 3) { - $clamp = 100; - } else { - $clamp = 1; - } - - $hsl[] = $this->clamp($val, $clamp); - $i++; - } - - while (count($hsl) < 4) { - $hsl[] = 0; - } - return $this->toRGB($hsl); - - } elseif ($fname == 'rgb' || $fname == 'rgba') { - $components = array(); - $i = 1; - foreach ($rawComponents as $c) { - $c = $this->reduce($c); - if ($i < 4) { - if ($c[0] == "number" && $c[2] == "%") { - $components[] = 255 * ($c[1] / 100); - } else { - $components[] = floatval($c[1]); - } - } elseif ($i == 4) { - if ($c[0] == "number" && $c[2] == "%") { - $components[] = 1.0 * ($c[1] / 100); - } else { - $components[] = floatval($c[1]); - } - } else break; - - $i++; - } - while (count($components) < 3) { - $components[] = 0; - } - array_unshift($components, 'color'); - return $this->fixColor($components); - } - - return false; - } - - protected function reduce($value, $forExpression = false) { - switch ($value[0]) { - case "interpolate": - $reduced = $this->reduce($value[1]); - $var = $this->compileValue($reduced); - $res = $this->reduce(array("variable", $this->vPrefix . $var)); - - if ($res[0] == "raw_color") { - $res = $this->coerceColor($res); - } - - if (empty($value[2])) $res = $this->lib_e($res); - - return $res; - case "variable": - $key = $value[1]; - if (is_array($key)) { - $key = $this->reduce($key); - $key = $this->vPrefix . $this->compileValue($this->lib_e($key)); - } - - $seen =& $this->env->seenNames; - - if (!empty($seen[$key])) { - $this->throwError("infinite loop detected: $key"); - } - - $seen[$key] = true; - $out = $this->reduce($this->get($key)); - $seen[$key] = false; - return $out; - case "list": - foreach ($value[2] as &$item) { - $item = $this->reduce($item, $forExpression); - } - return $value; - case "expression": - return $this->evaluate($value); - case "string": - foreach ($value[2] as &$part) { - if (is_array($part)) { - $strip = $part[0] == "variable"; - $part = $this->reduce($part); - if ($strip) $part = $this->lib_e($part); - } - } - return $value; - case "escape": - list(,$inner) = $value; - return $this->lib_e($this->reduce($inner)); - case "function": - $color = $this->funcToColor($value); - if ($color) return $color; - - list(, $name, $args) = $value; - if ($name == "%") $name = "_sprintf"; - - $f = isset($this->libFunctions[$name]) ? - $this->libFunctions[$name] : array($this, 'lib_'.str_replace('-', '_', $name)); - - if (is_callable($f)) { - if ($args[0] == 'list') - $args = self::compressList($args[2], $args[1]); - - $ret = call_user_func($f, $this->reduce($args, true), $this); - - if (is_null($ret)) { - return array("string", "", array( - $name, "(", $args, ")" - )); - } - - // convert to a typed value if the result is a php primitive - if (is_numeric($ret)) { - $ret = array('number', $ret, ""); - } elseif (!is_array($ret)) { - $ret = array('keyword', $ret); - } - - return $ret; - } - - // plain function, reduce args - $value[2] = $this->reduce($value[2]); - return $value; - case "unary": - list(, $op, $exp) = $value; - $exp = $this->reduce($exp); - - if ($exp[0] == "number") { - switch ($op) { - case "+": - return $exp; - case "-": - $exp[1] *= -1; - return $exp; - } - } - return array("string", "", array($op, $exp)); - } - - if ($forExpression) { - switch ($value[0]) { - case "keyword": - if ($color = $this->coerceColor($value)) { - return $color; - } - break; - case "raw_color": - return $this->coerceColor($value); - } - } - - return $value; - } - - - // coerce a value for use in color operation - protected function coerceColor($value) { - switch ($value[0]) { - case 'color': return $value; - case 'raw_color': - $c = array("color", 0, 0, 0); - $colorStr = substr($value[1], 1); - $num = hexdec($colorStr); - $width = strlen($colorStr) == 3 ? 16 : 256; - - for ($i = 3; $i > 0; $i--) { // 3 2 1 - $t = $num % $width; - $num /= $width; - - $c[$i] = $t * (256/$width) + $t * floor(16/$width); - } - - return $c; - case 'keyword': - $name = $value[1]; - if (isset(self::$cssColors[$name])) { - $rgba = explode(',', self::$cssColors[$name]); - - if (isset($rgba[3])) { - return array('color', $rgba[0], $rgba[1], $rgba[2], $rgba[3]); - } - return array('color', $rgba[0], $rgba[1], $rgba[2]); - } - return null; - } - } - - // make something string like into a string - protected function coerceString($value) { - switch ($value[0]) { - case "string": - return $value; - case "keyword": - return array("string", "", array($value[1])); - } - return null; - } - - // turn list of length 1 into value type - protected function flattenList($value) { - if ($value[0] == "list" && count($value[2]) == 1) { - return $this->flattenList($value[2][0]); - } - return $value; - } - - public function toBool($a) { - return $a ? self::$TRUE : self::$FALSE; - } - - // evaluate an expression - protected function evaluate($exp) { - list(, $op, $left, $right, $whiteBefore, $whiteAfter) = $exp; - - $left = $this->reduce($left, true); - $right = $this->reduce($right, true); - - if ($leftColor = $this->coerceColor($left)) { - $left = $leftColor; - } - - if ($rightColor = $this->coerceColor($right)) { - $right = $rightColor; - } - - $ltype = $left[0]; - $rtype = $right[0]; - - // operators that work on all types - if ($op == "and") { - return $this->toBool($left == self::$TRUE && $right == self::$TRUE); - } - - if ($op == "=") { - return $this->toBool($this->eq($left, $right) ); - } - - if ($op == "+" && !is_null($str = $this->stringConcatenate($left, $right))) { - return $str; - } - - // type based operators - $fname = "op_${ltype}_${rtype}"; - if (is_callable(array($this, $fname))) { - $out = $this->$fname($op, $left, $right); - if (!is_null($out)) return $out; - } - - // make the expression look it did before being parsed - $paddedOp = $op; - if ($whiteBefore) { - $paddedOp = " " . $paddedOp; - } - if ($whiteAfter) { - $paddedOp .= " "; - } - - return array("string", "", array($left, $paddedOp, $right)); - } - - protected function stringConcatenate($left, $right) { - if ($strLeft = $this->coerceString($left)) { - if ($right[0] == "string") { - $right[1] = ""; - } - $strLeft[2][] = $right; - return $strLeft; - } - - if ($strRight = $this->coerceString($right)) { - array_unshift($strRight[2], $left); - return $strRight; - } - } - - - // make sure a color's components don't go out of bounds - protected function fixColor($c) { - foreach (range(1, 3) as $i) { - if ($c[$i] < 0) $c[$i] = 0; - if ($c[$i] > 255) $c[$i] = 255; - } - - return $c; - } - - protected function op_number_color($op, $lft, $rgt) { - if ($op == '+' || $op == '*') { - return $this->op_color_number($op, $rgt, $lft); - } - } - - protected function op_color_number($op, $lft, $rgt) { - if ($rgt[0] == '%') $rgt[1] /= 100; - - return $this->op_color_color($op, $lft, - array_fill(1, count($lft) - 1, $rgt[1])); - } - - protected function op_color_color($op, $left, $right) { - $out = array('color'); - $max = count($left) > count($right) ? count($left) : count($right); - foreach (range(1, $max - 1) as $i) { - $lval = isset($left[$i]) ? $left[$i] : 0; - $rval = isset($right[$i]) ? $right[$i] : 0; - switch ($op) { - case '+': - $out[] = $lval + $rval; - break; - case '-': - $out[] = $lval - $rval; - break; - case '*': - $out[] = $lval * $rval; - break; - case '%': - $out[] = $lval % $rval; - break; - case '/': - if ($rval == 0) { - $this->throwError("evaluate error: can't divide by zero"); - } - $out[] = $lval / $rval; - break; - default: - $this->throwError('evaluate error: color op number failed on op '.$op); - } - } - return $this->fixColor($out); - } - - public function lib_red($color){ - $color = $this->coerceColor($color); - if (is_null($color)) { - $this->throwError('color expected for red()'); - } - - return $color[1]; - } - - public function lib_green($color){ - $color = $this->coerceColor($color); - if (is_null($color)) { - $this->throwError('color expected for green()'); - } - - return $color[2]; - } - - public function lib_blue($color){ - $color = $this->coerceColor($color); - if (is_null($color)) { - $this->throwError('color expected for blue()'); - } - - return $color[3]; - } - - - // operator on two numbers - protected function op_number_number($op, $left, $right) { - $unit = empty($left[2]) ? $right[2] : $left[2]; - - $value = 0; - switch ($op) { - case '+': - $value = $left[1] + $right[1]; - break; - case '*': - $value = $left[1] * $right[1]; - break; - case '-': - $value = $left[1] - $right[1]; - break; - case '%': - $value = $left[1] % $right[1]; - break; - case '/': - if ($right[1] == 0) $this->throwError('parse error: divide by zero'); - $value = $left[1] / $right[1]; - break; - case '<': - return $this->toBool($left[1] < $right[1]); - case '>': - return $this->toBool($left[1] > $right[1]); - case '>=': - return $this->toBool($left[1] >= $right[1]); - case '=<': - return $this->toBool($left[1] <= $right[1]); - default: - $this->throwError('parse error: unknown number operator: '.$op); - } - - return array("number", $value, $unit); - } - - - /* environment functions */ - - protected function makeOutputBlock($type, $selectors = null) { - $b = new stdclass; - $b->lines = array(); - $b->children = array(); - $b->selectors = $selectors; - $b->type = $type; - $b->parent = $this->scope; - return $b; - } - - // the state of execution - protected function pushEnv($block = null) { - $e = new stdclass; - $e->parent = $this->env; - $e->store = array(); - $e->block = $block; - - $this->env = $e; - return $e; - } - - // pop something off the stack - protected function popEnv() { - $old = $this->env; - $this->env = $this->env->parent; - return $old; - } - - // set something in the current env - protected function set($name, $value) { - $this->env->store[$name] = $value; - } - - - // get the highest occurrence entry for a name - protected function get($name) { - $current = $this->env; - - $isArguments = $name == $this->vPrefix . 'arguments'; - while ($current) { - if ($isArguments && isset($current->arguments)) { - return array('list', ' ', $current->arguments); - } - - if (isset($current->store[$name])) { - return $current->store[$name]; - } - - $current = isset($current->storeParent) ? - $current->storeParent : - $current->parent; - } - - $this->throwError("variable $name is undefined"); - } - - // inject array of unparsed strings into environment as variables - protected function injectVariables($args) { - $this->pushEnv(); - $parser = new lessc_parser($this, __METHOD__); - foreach ($args as $name => $strValue) { - if ($name[0] !== '@') { - $name = '@' . $name; - } - $parser->count = 0; - $parser->buffer = (string)$strValue; - if (!$parser->propertyValue($value)) { - throw new Exception("failed to parse passed in variable $name: $strValue"); - } - - $this->set($name, $value); - } - } - - /** - * Initialize any static state, can initialize parser for a file - * $opts isn't used yet - */ - public function __construct($fname = null) { - if ($fname !== null) { - // used for deprecated parse method - $this->_parseFile = $fname; - } - } - - public function compile($string, $name = null) { - $locale = setlocale(LC_NUMERIC, 0); - setlocale(LC_NUMERIC, "C"); - - $this->parser = $this->makeParser($name); - $root = $this->parser->parse($string); - - $this->env = null; - $this->scope = null; - - $this->formatter = $this->newFormatter(); - - if (!empty($this->registeredVars)) { - $this->injectVariables($this->registeredVars); - } - - $this->sourceParser = $this->parser; // used for error messages - $this->compileBlock($root); - - ob_start(); - $this->formatter->block($this->scope); - $out = ob_get_clean(); - setlocale(LC_NUMERIC, $locale); - return $out; - } - - public function compileFile($fname, $outFname = null) { - if (!is_readable($fname)) { - throw new Exception('load error: failed to find '.$fname); - } - - $pi = pathinfo($fname); - - $oldImport = $this->importDir; - - $this->importDir = (array)$this->importDir; - $this->importDir[] = $pi['dirname'].'/'; - - $this->addParsedFile($fname); - - $out = $this->compile(file_get_contents($fname), $fname); - - $this->importDir = $oldImport; - - if ($outFname !== null) { - return file_put_contents($outFname, $out); - } - - return $out; - } - - // compile only if changed input has changed or output doesn't exist - public function checkedCompile($in, $out) { - if (!is_file($out) || filemtime($in) > filemtime($out)) { - $this->compileFile($in, $out); - return true; - } - return false; - } - - /** - * Execute lessphp on a .less file or a lessphp cache structure - * - * The lessphp cache structure contains information about a specific - * less file having been parsed. It can be used as a hint for future - * calls to determine whether or not a rebuild is required. - * - * The cache structure contains two important keys that may be used - * externally: - * - * compiled: The final compiled CSS - * updated: The time (in seconds) the CSS was last compiled - * - * The cache structure is a plain-ol' PHP associative array and can - * be serialized and unserialized without a hitch. - * - * @param mixed $in Input - * @param bool $force Force rebuild? - * @return array lessphp cache structure - */ - public function cachedCompile($in, $force = false) { - // assume no root - $root = null; - - if (is_string($in)) { - $root = $in; - } elseif (is_array($in) && isset($in['root'])) { - if ($force || !isset($in['files'])) { - // If we are forcing a recompile or if for some reason the - // structure does not contain any file information we should - // specify the root to trigger a rebuild. - $root = $in['root']; - } elseif (isset($in['files']) && is_array($in['files'])) { - foreach ($in['files'] as $fname => $ftime) { - if (!file_exists($fname) || filemtime($fname) > $ftime) { - // One of the files we knew about previously has changed - // so we should look at our incoming root again. - $root = $in['root']; - break; - } - } - } - } else { - // TODO: Throw an exception? We got neither a string nor something - // that looks like a compatible lessphp cache structure. - return null; - } - - if ($root !== null) { - // If we have a root value which means we should rebuild. - $out = array(); - $out['root'] = $root; - $out['compiled'] = $this->compileFile($root); - $out['files'] = $this->allParsedFiles(); - $out['updated'] = time(); - return $out; - } else { - // No changes, pass back the structure - // we were given initially. - return $in; - } - - } - - // parse and compile buffer - // This is deprecated - public function parse($str = null, $initialVariables = null) { - if (is_array($str)) { - $initialVariables = $str; - $str = null; - } - - $oldVars = $this->registeredVars; - if ($initialVariables !== null) { - $this->setVariables($initialVariables); - } - - if ($str == null) { - if (empty($this->_parseFile)) { - throw new exception("nothing to parse"); - } - - $out = $this->compileFile($this->_parseFile); - } else { - $out = $this->compile($str); - } - - $this->registeredVars = $oldVars; - return $out; - } - - protected function makeParser($name) { - $parser = new lessc_parser($this, $name); - $parser->writeComments = $this->preserveComments; - - return $parser; - } - - public function setFormatter($name) { - $this->formatterName = $name; - } - - protected function newFormatter() { - $className = "lessc_formatter_lessjs"; - if (!empty($this->formatterName)) { - if (!is_string($this->formatterName)) - return $this->formatterName; - $className = "lessc_formatter_$this->formatterName"; - } - - return new $className; - } - - public function setPreserveComments($preserve) { - $this->preserveComments = $preserve; - } - - public function registerFunction($name, $func) { - $this->libFunctions[$name] = $func; - } - - public function unregisterFunction($name) { - unset($this->libFunctions[$name]); - } - - public function setVariables($variables) { - $this->registeredVars = array_merge($this->registeredVars, $variables); - } - - public function unsetVariable($name) { - unset($this->registeredVars[$name]); - } - - public function setImportDir($dirs) { - $this->importDir = (array)$dirs; - } - - public function addImportDir($dir) { - $this->importDir = (array)$this->importDir; - $this->importDir[] = $dir; - } - - public function allParsedFiles() { - return $this->allParsedFiles; - } - - public function addParsedFile($file) { - $this->allParsedFiles[realpath($file)] = filemtime($file); - } - - /** - * Uses the current value of $this->count to show line and line number - */ - public function throwError($msg = null) { - if ($this->sourceLoc >= 0) { - $this->sourceParser->throwError($msg, $this->sourceLoc); - } - throw new exception($msg); - } - - // compile file $in to file $out if $in is newer than $out - // returns true when it compiles, false otherwise - public static function ccompile($in, $out, $less = null) { - if ($less === null) { - $less = new self; - } - return $less->checkedCompile($in, $out); - } - - public static function cexecute($in, $force = false, $less = null) { - if ($less === null) { - $less = new self; - } - return $less->cachedCompile($in, $force); - } - - static protected $cssColors = array( - 'aliceblue' => '240,248,255', - 'antiquewhite' => '250,235,215', - 'aqua' => '0,255,255', - 'aquamarine' => '127,255,212', - 'azure' => '240,255,255', - 'beige' => '245,245,220', - 'bisque' => '255,228,196', - 'black' => '0,0,0', - 'blanchedalmond' => '255,235,205', - 'blue' => '0,0,255', - 'blueviolet' => '138,43,226', - 'brown' => '165,42,42', - 'burlywood' => '222,184,135', - 'cadetblue' => '95,158,160', - 'chartreuse' => '127,255,0', - 'chocolate' => '210,105,30', - 'coral' => '255,127,80', - 'cornflowerblue' => '100,149,237', - 'cornsilk' => '255,248,220', - 'crimson' => '220,20,60', - 'cyan' => '0,255,255', - 'darkblue' => '0,0,139', - 'darkcyan' => '0,139,139', - 'darkgoldenrod' => '184,134,11', - 'darkgray' => '169,169,169', - 'darkgreen' => '0,100,0', - 'darkgrey' => '169,169,169', - 'darkkhaki' => '189,183,107', - 'darkmagenta' => '139,0,139', - 'darkolivegreen' => '85,107,47', - 'darkorange' => '255,140,0', - 'darkorchid' => '153,50,204', - 'darkred' => '139,0,0', - 'darksalmon' => '233,150,122', - 'darkseagreen' => '143,188,143', - 'darkslateblue' => '72,61,139', - 'darkslategray' => '47,79,79', - 'darkslategrey' => '47,79,79', - 'darkturquoise' => '0,206,209', - 'darkviolet' => '148,0,211', - 'deeppink' => '255,20,147', - 'deepskyblue' => '0,191,255', - 'dimgray' => '105,105,105', - 'dimgrey' => '105,105,105', - 'dodgerblue' => '30,144,255', - 'firebrick' => '178,34,34', - 'floralwhite' => '255,250,240', - 'forestgreen' => '34,139,34', - 'fuchsia' => '255,0,255', - 'gainsboro' => '220,220,220', - 'ghostwhite' => '248,248,255', - 'gold' => '255,215,0', - 'goldenrod' => '218,165,32', - 'gray' => '128,128,128', - 'green' => '0,128,0', - 'greenyellow' => '173,255,47', - 'grey' => '128,128,128', - 'honeydew' => '240,255,240', - 'hotpink' => '255,105,180', - 'indianred' => '205,92,92', - 'indigo' => '75,0,130', - 'ivory' => '255,255,240', - 'khaki' => '240,230,140', - 'lavender' => '230,230,250', - 'lavenderblush' => '255,240,245', - 'lawngreen' => '124,252,0', - 'lemonchiffon' => '255,250,205', - 'lightblue' => '173,216,230', - 'lightcoral' => '240,128,128', - 'lightcyan' => '224,255,255', - 'lightgoldenrodyellow' => '250,250,210', - 'lightgray' => '211,211,211', - 'lightgreen' => '144,238,144', - 'lightgrey' => '211,211,211', - 'lightpink' => '255,182,193', - 'lightsalmon' => '255,160,122', - 'lightseagreen' => '32,178,170', - 'lightskyblue' => '135,206,250', - 'lightslategray' => '119,136,153', - 'lightslategrey' => '119,136,153', - 'lightsteelblue' => '176,196,222', - 'lightyellow' => '255,255,224', - 'lime' => '0,255,0', - 'limegreen' => '50,205,50', - 'linen' => '250,240,230', - 'magenta' => '255,0,255', - 'maroon' => '128,0,0', - 'mediumaquamarine' => '102,205,170', - 'mediumblue' => '0,0,205', - 'mediumorchid' => '186,85,211', - 'mediumpurple' => '147,112,219', - 'mediumseagreen' => '60,179,113', - 'mediumslateblue' => '123,104,238', - 'mediumspringgreen' => '0,250,154', - 'mediumturquoise' => '72,209,204', - 'mediumvioletred' => '199,21,133', - 'midnightblue' => '25,25,112', - 'mintcream' => '245,255,250', - 'mistyrose' => '255,228,225', - 'moccasin' => '255,228,181', - 'navajowhite' => '255,222,173', - 'navy' => '0,0,128', - 'oldlace' => '253,245,230', - 'olive' => '128,128,0', - 'olivedrab' => '107,142,35', - 'orange' => '255,165,0', - 'orangered' => '255,69,0', - 'orchid' => '218,112,214', - 'palegoldenrod' => '238,232,170', - 'palegreen' => '152,251,152', - 'paleturquoise' => '175,238,238', - 'palevioletred' => '219,112,147', - 'papayawhip' => '255,239,213', - 'peachpuff' => '255,218,185', - 'peru' => '205,133,63', - 'pink' => '255,192,203', - 'plum' => '221,160,221', - 'powderblue' => '176,224,230', - 'purple' => '128,0,128', - 'red' => '255,0,0', - 'rosybrown' => '188,143,143', - 'royalblue' => '65,105,225', - 'saddlebrown' => '139,69,19', - 'salmon' => '250,128,114', - 'sandybrown' => '244,164,96', - 'seagreen' => '46,139,87', - 'seashell' => '255,245,238', - 'sienna' => '160,82,45', - 'silver' => '192,192,192', - 'skyblue' => '135,206,235', - 'slateblue' => '106,90,205', - 'slategray' => '112,128,144', - 'slategrey' => '112,128,144', - 'snow' => '255,250,250', - 'springgreen' => '0,255,127', - 'steelblue' => '70,130,180', - 'tan' => '210,180,140', - 'teal' => '0,128,128', - 'thistle' => '216,191,216', - 'tomato' => '255,99,71', - 'transparent' => '0,0,0,0', - 'turquoise' => '64,224,208', - 'violet' => '238,130,238', - 'wheat' => '245,222,179', - 'white' => '255,255,255', - 'whitesmoke' => '245,245,245', - 'yellow' => '255,255,0', - 'yellowgreen' => '154,205,50' - ); -} - -// responsible for taking a string of LESS code and converting it into a -// syntax tree -class lessc_parser { - static protected $nextBlockId = 0; // used to uniquely identify blocks - - static protected $precedence = array( - '=<' => 0, - '>=' => 0, - '=' => 0, - '<' => 0, - '>' => 0, - - '+' => 1, - '-' => 1, - '*' => 2, - '/' => 2, - '%' => 2, - ); - - static protected $whitePattern; - static protected $commentMulti; - - static protected $commentSingle = "//"; - static protected $commentMultiLeft = "/*"; - static protected $commentMultiRight = "*/"; - - // regex string to match any of the operators - static protected $operatorString; - - // these properties will supress division unless it's inside parenthases - static protected $supressDivisionProps = - array('/border-radius$/i', '/^font$/i'); - - protected $blockDirectives = array("font-face", "keyframes", "page", "-moz-document", "viewport", "-moz-viewport", "-o-viewport", "-ms-viewport"); - protected $lineDirectives = array("charset"); - - /** - * if we are in parens we can be more liberal with whitespace around - * operators because it must evaluate to a single value and thus is less - * ambiguous. - * - * Consider: - * property1: 10 -5; // is two numbers, 10 and -5 - * property2: (10 -5); // should evaluate to 5 - */ - protected $inParens = false; - - // caches preg escaped literals - static protected $literalCache = array(); - - public function __construct($lessc, $sourceName = null) { - $this->eatWhiteDefault = true; - // reference to less needed for vPrefix, mPrefix, and parentSelector - $this->lessc = $lessc; - - $this->sourceName = $sourceName; // name used for error messages - - $this->writeComments = false; - - if (!self::$operatorString) { - self::$operatorString = - '('.implode('|', array_map(array('lessc', 'preg_quote'), - array_keys(self::$precedence))).')'; - - $commentSingle = lessc::preg_quote(self::$commentSingle); - $commentMultiLeft = lessc::preg_quote(self::$commentMultiLeft); - $commentMultiRight = lessc::preg_quote(self::$commentMultiRight); - - self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight; - self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais'; - } - } - - public function parse($buffer) { - $this->count = 0; - $this->line = 1; - - $this->env = null; // block stack - $this->buffer = $this->writeComments ? $buffer : $this->removeComments($buffer); - $this->pushSpecialBlock("root"); - $this->eatWhiteDefault = true; - $this->seenComments = array(); - - // trim whitespace on head - // if (preg_match('/^\s+/', $this->buffer, $m)) { - // $this->line += substr_count($m[0], "\n"); - // $this->buffer = ltrim($this->buffer); - // } - $this->whitespace(); - - // parse the entire file - while (false !== $this->parseChunk()); - - if ($this->count != strlen($this->buffer)) - $this->throwError(); - - // TODO report where the block was opened - if ( !property_exists($this->env, 'parent') || !is_null($this->env->parent) ) - throw new exception('parse error: unclosed block'); - - return $this->env; - } - - /** - * Parse a single chunk off the head of the buffer and append it to the - * current parse environment. - * Returns false when the buffer is empty, or when there is an error. - * - * This function is called repeatedly until the entire document is - * parsed. - * - * This parser is most similar to a recursive descent parser. Single - * functions represent discrete grammatical rules for the language, and - * they are able to capture the text that represents those rules. - * - * Consider the function lessc::keyword(). (all parse functions are - * structured the same) - * - * The function takes a single reference argument. When calling the - * function it will attempt to match a keyword on the head of the buffer. - * If it is successful, it will place the keyword in the referenced - * argument, advance the position in the buffer, and return true. If it - * fails then it won't advance the buffer and it will return false. - * - * All of these parse functions are powered by lessc::match(), which behaves - * the same way, but takes a literal regular expression. Sometimes it is - * more convenient to use match instead of creating a new function. - * - * Because of the format of the functions, to parse an entire string of - * grammatical rules, you can chain them together using &&. - * - * But, if some of the rules in the chain succeed before one fails, then - * the buffer position will be left at an invalid state. In order to - * avoid this, lessc::seek() is used to remember and set buffer positions. - * - * Before parsing a chain, use $s = $this->seek() to remember the current - * position into $s. Then if a chain fails, use $this->seek($s) to - * go back where we started. - */ - protected function parseChunk() { - if (empty($this->buffer)) return false; - $s = $this->seek(); - - if ($this->whitespace()) { - return true; - } - - // setting a property - if ($this->keyword($key) && $this->assign() && - $this->propertyValue($value, $key) && $this->end() - ) { - $this->append(array('assign', $key, $value), $s); - return true; - } else { - $this->seek($s); - } - - - // look for special css blocks - if ($this->literal('@', false)) { - $this->count--; - - // media - if ($this->literal('@media')) { - if (($this->mediaQueryList($mediaQueries) || true) - && $this->literal('{') - ) { - $media = $this->pushSpecialBlock("media"); - $media->queries = is_null($mediaQueries) ? array() : $mediaQueries; - return true; - } else { - $this->seek($s); - return false; - } - } - - if ($this->literal("@", false) && $this->keyword($dirName)) { - if ($this->isDirective($dirName, $this->blockDirectives)) { - if (($this->openString("{", $dirValue, null, array(";")) || true) && - $this->literal("{") - ) { - $dir = $this->pushSpecialBlock("directive"); - $dir->name = $dirName; - if (isset($dirValue)) $dir->value = $dirValue; - return true; - } - } elseif ($this->isDirective($dirName, $this->lineDirectives)) { - if ($this->propertyValue($dirValue) && $this->end()) { - $this->append(array("directive", $dirName, $dirValue)); - return true; - } - } - } - - $this->seek($s); - } - - // setting a variable - if ($this->variable($var) && $this->assign() && - $this->propertyValue($value) && $this->end() - ) { - $this->append(array('assign', $var, $value), $s); - return true; - } else { - $this->seek($s); - } - - if ($this->import($importValue)) { - $this->append($importValue, $s); - return true; - } - - // opening parametric mixin - if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) && - ($this->guards($guards) || true) && - $this->literal('{') - ) { - $block = $this->pushBlock($this->fixTags(array($tag))); - $block->args = $args; - $block->isVararg = $isVararg; - if (!empty($guards)) $block->guards = $guards; - return true; - } else { - $this->seek($s); - } - - // opening a simple block - if ($this->tags($tags) && $this->literal('{', false)) { - $tags = $this->fixTags($tags); - $this->pushBlock($tags); - return true; - } else { - $this->seek($s); - } - - // closing a block - if ($this->literal('}', false)) { - try { - $block = $this->pop(); - } catch (exception $e) { - $this->seek($s); - $this->throwError($e->getMessage()); - } - - $hidden = false; - if (is_null($block->type)) { - $hidden = true; - if (!isset($block->args)) { - foreach ($block->tags as $tag) { - if (!is_string($tag) || $tag[0] != $this->lessc->mPrefix) { - $hidden = false; - break; - } - } - } - - foreach ($block->tags as $tag) { - if (is_string($tag)) { - $this->env->children[$tag][] = $block; - } - } - } - - if (!$hidden) { - $this->append(array('block', $block), $s); - } - - // this is done here so comments aren't bundled into he block that - // was just closed - $this->whitespace(); - return true; - } - - // mixin - if ($this->mixinTags($tags) && - ($this->argumentDef($argv, $isVararg) || true) && - ($this->keyword($suffix) || true) && $this->end() - ) { - $tags = $this->fixTags($tags); - $this->append(array('mixin', $tags, $argv, $suffix), $s); - return true; - } else { - $this->seek($s); - } - - // spare ; - if ($this->literal(';')) return true; - - return false; // got nothing, throw error - } - - protected function isDirective($dirname, $directives) { - // TODO: cache pattern in parser - $pattern = implode("|", - array_map(array("lessc", "preg_quote"), $directives)); - $pattern = '/^(-[a-z-]+-)?(' . $pattern . ')$/i'; - - return preg_match($pattern, $dirname); - } - - protected function fixTags($tags) { - // move @ tags out of variable namespace - foreach ($tags as &$tag) { - if ($tag[0] == $this->lessc->vPrefix) - $tag[0] = $this->lessc->mPrefix; - } - return $tags; - } - - // a list of expressions - protected function expressionList(&$exps) { - $values = array(); - - while ($this->expression($exp)) { - $values[] = $exp; - } - - if (count($values) == 0) return false; - - $exps = lessc::compressList($values, ' '); - return true; - } - - /** - * Attempt to consume an expression. - * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code - */ - protected function expression(&$out) { - if ($this->value($lhs)) { - $out = $this->expHelper($lhs, 0); - - // look for / shorthand - if (!empty($this->env->supressedDivision)) { - unset($this->env->supressedDivision); - $s = $this->seek(); - if ($this->literal("/") && $this->value($rhs)) { - $out = array("list", "", - array($out, array("keyword", "/"), $rhs)); - } else { - $this->seek($s); - } - } - - return true; - } - return false; - } - - /** - * recursively parse infix equation with $lhs at precedence $minP - */ - protected function expHelper($lhs, $minP) { - $this->inExp = true; - $ss = $this->seek(); - - while (true) { - $whiteBefore = isset($this->buffer[$this->count - 1]) && - ctype_space($this->buffer[$this->count - 1]); - - // If there is whitespace before the operator, then we require - // whitespace after the operator for it to be an expression - $needWhite = $whiteBefore && !$this->inParens; - - if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) { - if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) { - foreach (self::$supressDivisionProps as $pattern) { - if (preg_match($pattern, $this->env->currentProperty)) { - $this->env->supressedDivision = true; - break 2; - } - } - } - - - $whiteAfter = isset($this->buffer[$this->count - 1]) && - ctype_space($this->buffer[$this->count - 1]); - - if (!$this->value($rhs)) break; - - // peek for next operator to see what to do with rhs - if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) { - $rhs = $this->expHelper($rhs, self::$precedence[$next[1]]); - } - - $lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter); - $ss = $this->seek(); - - continue; - } - - break; - } - - $this->seek($ss); - - return $lhs; - } - - // consume a list of values for a property - public function propertyValue(&$value, $keyName = null) { - $values = array(); - - if ($keyName !== null) $this->env->currentProperty = $keyName; - - $s = null; - while ($this->expressionList($v)) { - $values[] = $v; - $s = $this->seek(); - if (!$this->literal(',')) break; - } - - if ($s) $this->seek($s); - - if ($keyName !== null) unset($this->env->currentProperty); - - if (count($values) == 0) return false; - - $value = lessc::compressList($values, ', '); - return true; - } - - protected function parenValue(&$out) { - $s = $this->seek(); - - // speed shortcut - if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") { - return false; - } - - $inParens = $this->inParens; - if ($this->literal("(") && - ($this->inParens = true) && $this->expression($exp) && - $this->literal(")") - ) { - $out = $exp; - $this->inParens = $inParens; - return true; - } else { - $this->inParens = $inParens; - $this->seek($s); - } - - return false; - } - - // a single value - protected function value(&$value) { - $s = $this->seek(); - - // speed shortcut - if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") { - // negation - if ($this->literal("-", false) && - (($this->variable($inner) && $inner = array("variable", $inner)) || - $this->unit($inner) || - $this->parenValue($inner)) - ) { - $value = array("unary", "-", $inner); - return true; - } else { - $this->seek($s); - } - } - - if ($this->parenValue($value)) return true; - if ($this->unit($value)) return true; - if ($this->color($value)) return true; - if ($this->func($value)) return true; - if ($this->string($value)) return true; - - if ($this->keyword($word)) { - $value = array('keyword', $word); - return true; - } - - // try a variable - if ($this->variable($var)) { - $value = array('variable', $var); - return true; - } - - // unquote string (should this work on any type? - if ($this->literal("~") && $this->string($str)) { - $value = array("escape", $str); - return true; - } else { - $this->seek($s); - } - - // css hack: \0 - if ($this->literal('\\') && $this->match('([0-9]+)', $m)) { - $value = array('keyword', '\\'.$m[1]); - return true; - } else { - $this->seek($s); - } - - return false; - } - - // an import statement - protected function import(&$out) { - if (!$this->literal('@import')) return false; - - // @import "something.css" media; - // @import url("something.css") media; - // @import url(something.css) media; - - if ($this->propertyValue($value)) { - $out = array("import", $value); - return true; - } - } - - protected function mediaQueryList(&$out) { - if ($this->genericList($list, "mediaQuery", ",", false)) { - $out = $list[2]; - return true; - } - return false; - } - - protected function mediaQuery(&$out) { - $s = $this->seek(); - - $expressions = null; - $parts = array(); - - if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) { - $prop = array("mediaType"); - if (isset($only)) $prop[] = "only"; - if (isset($not)) $prop[] = "not"; - $prop[] = $mediaType; - $parts[] = $prop; - } else { - $this->seek($s); - } - - - if (!empty($mediaType) && !$this->literal("and")) { - // ~ - } else { - $this->genericList($expressions, "mediaExpression", "and", false); - if (is_array($expressions)) $parts = array_merge($parts, $expressions[2]); - } - - if (count($parts) == 0) { - $this->seek($s); - return false; - } - - $out = $parts; - return true; - } - - protected function mediaExpression(&$out) { - $s = $this->seek(); - $value = null; - if ($this->literal("(") && - $this->keyword($feature) && - ($this->literal(":") && $this->expression($value) || true) && - $this->literal(")") - ) { - $out = array("mediaExp", $feature); - if ($value) $out[] = $value; - return true; - } elseif ($this->variable($variable)) { - $out = array('variable', $variable); - return true; - } - - $this->seek($s); - return false; - } - - // an unbounded string stopped by $end - protected function openString($end, &$out, $nestingOpen=null, $rejectStrs = null) { - $oldWhite = $this->eatWhiteDefault; - $this->eatWhiteDefault = false; - - $stop = array("'", '"', "@{", $end); - $stop = array_map(array("lessc", "preg_quote"), $stop); - // $stop[] = self::$commentMulti; - - if (!is_null($rejectStrs)) { - $stop = array_merge($stop, $rejectStrs); - } - - $patt = '(.*?)('.implode("|", $stop).')'; - - $nestingLevel = 0; - - $content = array(); - while ($this->match($patt, $m, false)) { - if (!empty($m[1])) { - $content[] = $m[1]; - if ($nestingOpen) { - $nestingLevel += substr_count($m[1], $nestingOpen); - } - } - - $tok = $m[2]; - - $this->count-= strlen($tok); - if ($tok == $end) { - if ($nestingLevel == 0) { - break; - } else { - $nestingLevel--; - } - } - - if (($tok == "'" || $tok == '"') && $this->string($str)) { - $content[] = $str; - continue; - } - - if ($tok == "@{" && $this->interpolation($inter)) { - $content[] = $inter; - continue; - } - - if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) { - break; - } - - $content[] = $tok; - $this->count+= strlen($tok); - } - - $this->eatWhiteDefault = $oldWhite; - - if (count($content) == 0) return false; - - // trim the end - if (is_string(end($content))) { - $content[count($content) - 1] = rtrim(end($content)); - } - - $out = array("string", "", $content); - return true; - } - - protected function string(&$out) { - $s = $this->seek(); - if ($this->literal('"', false)) { - $delim = '"'; - } elseif ($this->literal("'", false)) { - $delim = "'"; - } else { - return false; - } - - $content = array(); - - // look for either ending delim , escape, or string interpolation - $patt = '([^\n]*?)(@\{|\\\\|' . - lessc::preg_quote($delim).')'; - - $oldWhite = $this->eatWhiteDefault; - $this->eatWhiteDefault = false; - - while ($this->match($patt, $m, false)) { - $content[] = $m[1]; - if ($m[2] == "@{") { - $this->count -= strlen($m[2]); - if ($this->interpolation($inter, false)) { - $content[] = $inter; - } else { - $this->count += strlen($m[2]); - $content[] = "@{"; // ignore it - } - } elseif ($m[2] == '\\') { - $content[] = $m[2]; - if ($this->literal($delim, false)) { - $content[] = $delim; - } - } else { - $this->count -= strlen($delim); - break; // delim - } - } - - $this->eatWhiteDefault = $oldWhite; - - if ($this->literal($delim)) { - $out = array("string", $delim, $content); - return true; - } - - $this->seek($s); - return false; - } - - protected function interpolation(&$out) { - $oldWhite = $this->eatWhiteDefault; - $this->eatWhiteDefault = true; - - $s = $this->seek(); - if ($this->literal("@{") && - $this->openString("}", $interp, null, array("'", '"', ";")) && - $this->literal("}", false) - ) { - $out = array("interpolate", $interp); - $this->eatWhiteDefault = $oldWhite; - if ($this->eatWhiteDefault) $this->whitespace(); - return true; - } - - $this->eatWhiteDefault = $oldWhite; - $this->seek($s); - return false; - } - - protected function unit(&$unit) { - // speed shortcut - if (isset($this->buffer[$this->count])) { - $char = $this->buffer[$this->count]; - if (!ctype_digit($char) && $char != ".") return false; - } - - if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) { - $unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]); - return true; - } - return false; - } - - // a # color - protected function color(&$out) { - if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) { - if (strlen($m[1]) > 7) { - $out = array("string", "", array($m[1])); - } else { - $out = array("raw_color", $m[1]); - } - return true; - } - - return false; - } - - // consume an argument definition list surrounded by () - // each argument is a variable name with optional value - // or at the end a ... or a variable named followed by ... - // arguments are separated by , unless a ; is in the list, then ; is the - // delimiter. - protected function argumentDef(&$args, &$isVararg) { - $s = $this->seek(); - if (!$this->literal('(')) { - return false; - } - - $values = array(); - $delim = ","; - $method = "expressionList"; - - $isVararg = false; - while (true) { - if ($this->literal("...")) { - $isVararg = true; - break; - } - - if ($this->$method($value)) { - if ($value[0] == "variable") { - $arg = array("arg", $value[1]); - $ss = $this->seek(); - - if ($this->assign() && $this->$method($rhs)) { - $arg[] = $rhs; - } else { - $this->seek($ss); - if ($this->literal("...")) { - $arg[0] = "rest"; - $isVararg = true; - } - } - - $values[] = $arg; - if ($isVararg) { - break; - } - continue; - } else { - $values[] = array("lit", $value); - } - } - - - if (!$this->literal($delim)) { - if ($delim == "," && $this->literal(";")) { - // found new delim, convert existing args - $delim = ";"; - $method = "propertyValue"; - - // transform arg list - if (isset($values[1])) { // 2 items - $newList = array(); - foreach ($values as $i => $arg) { - switch ($arg[0]) { - case "arg": - if ($i) { - $this->throwError("Cannot mix ; and , as delimiter types"); - } - $newList[] = $arg[2]; - break; - case "lit": - $newList[] = $arg[1]; - break; - case "rest": - $this->throwError("Unexpected rest before semicolon"); - } - } - - $newList = array("list", ", ", $newList); - - switch ($values[0][0]) { - case "arg": - $newArg = array("arg", $values[0][1], $newList); - break; - case "lit": - $newArg = array("lit", $newList); - break; - } - - } elseif ($values) { // 1 item - $newArg = $values[0]; - } - - if ($newArg) { - $values = array($newArg); - } - } else { - break; - } - } - } - - if (!$this->literal(')')) { - $this->seek($s); - return false; - } - - $args = $values; - - return true; - } - - // consume a list of tags - // this accepts a hanging delimiter - protected function tags(&$tags, $simple = false, $delim = ',') { - $tags = array(); - while ($this->tag($tt, $simple)) { - $tags[] = $tt; - if (!$this->literal($delim)) break; - } - if (count($tags) == 0) return false; - - return true; - } - - // list of tags of specifying mixin path - // optionally separated by > (lazy, accepts extra >) - protected function mixinTags(&$tags) { - $tags = array(); - while ($this->tag($tt, true)) { - $tags[] = $tt; - $this->literal(">"); - } - - if (!$tags) { - return false; - } - - return true; - } - - // a bracketed value (contained within in a tag definition) - protected function tagBracket(&$parts, &$hasExpression) { - // speed shortcut - if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") { - return false; - } - - $s = $this->seek(); - - $hasInterpolation = false; - - if ($this->literal("[", false)) { - $attrParts = array("["); - // keyword, string, operator - while (true) { - if ($this->literal("]", false)) { - $this->count--; - break; // get out early - } - - if ($this->match('\s+', $m)) { - $attrParts[] = " "; - continue; - } - if ($this->string($str)) { - // escape parent selector, (yuck) - foreach ($str[2] as &$chunk) { - $chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk); - } - - $attrParts[] = $str; - $hasInterpolation = true; - continue; - } - - if ($this->keyword($word)) { - $attrParts[] = $word; - continue; - } - - if ($this->interpolation($inter, false)) { - $attrParts[] = $inter; - $hasInterpolation = true; - continue; - } - - // operator, handles attr namespace too - if ($this->match('[|-~\$\*\^=]+', $m)) { - $attrParts[] = $m[0]; - continue; - } - - break; - } - - if ($this->literal("]", false)) { - $attrParts[] = "]"; - foreach ($attrParts as $part) { - $parts[] = $part; - } - $hasExpression = $hasExpression || $hasInterpolation; - return true; - } - $this->seek($s); - } - - $this->seek($s); - return false; - } - - // a space separated list of selectors - protected function tag(&$tag, $simple = false) { - if ($simple) { - $chars = '^@,:;{}\][>\(\) "\''; - } else { - $chars = '^@,;{}["\''; - } - $s = $this->seek(); - - $hasExpression = false; - $parts = array(); - while ($this->tagBracket($parts, $hasExpression)); - - $oldWhite = $this->eatWhiteDefault; - $this->eatWhiteDefault = false; - - while (true) { - if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) { - $parts[] = $m[1]; - if ($simple) break; - - while ($this->tagBracket($parts, $hasExpression)); - continue; - } - - if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") { - if ($this->interpolation($interp)) { - $hasExpression = true; - $interp[2] = true; // don't unescape - $parts[] = $interp; - continue; - } - - if ($this->literal("@")) { - $parts[] = "@"; - continue; - } - } - - if ($this->unit($unit)) { // for keyframes - $parts[] = $unit[1]; - $parts[] = $unit[2]; - continue; - } - - break; - } - - $this->eatWhiteDefault = $oldWhite; - if (!$parts) { - $this->seek($s); - return false; - } - - if ($hasExpression) { - $tag = array("exp", array("string", "", $parts)); - } else { - $tag = trim(implode($parts)); - } - - $this->whitespace(); - return true; - } - - // a css function - protected function func(&$func) { - $s = $this->seek(); - - if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) { - $fname = $m[1]; - - $sPreArgs = $this->seek(); - - $args = array(); - while (true) { - $ss = $this->seek(); - // this ugly nonsense is for ie filter properties - if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) { - $args[] = array("string", "", array($name, "=", $value)); - } else { - $this->seek($ss); - if ($this->expressionList($value)) { - $args[] = $value; - } - } - - if (!$this->literal(',')) break; - } - $args = array('list', ',', $args); - - if ($this->literal(')')) { - $func = array('function', $fname, $args); - return true; - } elseif ($fname == 'url') { - // couldn't parse and in url? treat as string - $this->seek($sPreArgs); - if ($this->openString(")", $string) && $this->literal(")")) { - $func = array('function', $fname, $string); - return true; - } - } - } - - $this->seek($s); - return false; - } - - // consume a less variable - protected function variable(&$name) { - $s = $this->seek(); - if ($this->literal($this->lessc->vPrefix, false) && - ($this->variable($sub) || $this->keyword($name)) - ) { - if (!empty($sub)) { - $name = array('variable', $sub); - } else { - $name = $this->lessc->vPrefix.$name; - } - return true; - } - - $name = null; - $this->seek($s); - return false; - } - - /** - * Consume an assignment operator - * Can optionally take a name that will be set to the current property name - */ - protected function assign($name = null) { - if ($name) $this->currentProperty = $name; - return $this->literal(':') || $this->literal('='); - } - - // consume a keyword - protected function keyword(&$word) { - if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) { - $word = $m[1]; - return true; - } - return false; - } - - // consume an end of statement delimiter - protected function end() { - if ($this->literal(';', false)) { - return true; - } elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') { - // if there is end of file or a closing block next then we don't need a ; - return true; - } - return false; - } - - protected function guards(&$guards) { - $s = $this->seek(); - - if (!$this->literal("when")) { - $this->seek($s); - return false; - } - - $guards = array(); - - while ($this->guardGroup($g)) { - $guards[] = $g; - if (!$this->literal(",")) break; - } - - if (count($guards) == 0) { - $guards = null; - $this->seek($s); - return false; - } - - return true; - } - - // a bunch of guards that are and'd together - // TODO rename to guardGroup - protected function guardGroup(&$guardGroup) { - $s = $this->seek(); - $guardGroup = array(); - while ($this->guard($guard)) { - $guardGroup[] = $guard; - if (!$this->literal("and")) break; - } - - if (count($guardGroup) == 0) { - $guardGroup = null; - $this->seek($s); - return false; - } - - return true; - } - - protected function guard(&$guard) { - $s = $this->seek(); - $negate = $this->literal("not"); - - if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) { - $guard = $exp; - if ($negate) $guard = array("negate", $guard); - return true; - } - - $this->seek($s); - return false; - } - - /* raw parsing functions */ - - protected function literal($what, $eatWhitespace = null) { - if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault; - - // shortcut on single letter - if (!isset($what[1]) && isset($this->buffer[$this->count])) { - if ($this->buffer[$this->count] == $what) { - if (!$eatWhitespace) { - $this->count++; - return true; - } - // goes below... - } else { - return false; - } - } - - if (!isset(self::$literalCache[$what])) { - self::$literalCache[$what] = lessc::preg_quote($what); - } - - return $this->match(self::$literalCache[$what], $m, $eatWhitespace); - } - - protected function genericList(&$out, $parseItem, $delim="", $flatten=true) { - $s = $this->seek(); - $items = array(); - while ($this->$parseItem($value)) { - $items[] = $value; - if ($delim) { - if (!$this->literal($delim)) break; - } - } - - if (count($items) == 0) { - $this->seek($s); - return false; - } - - if ($flatten && count($items) == 1) { - $out = $items[0]; - } else { - $out = array("list", $delim, $items); - } - - return true; - } - - - // advance counter to next occurrence of $what - // $until - don't include $what in advance - // $allowNewline, if string, will be used as valid char set - protected function to($what, &$out, $until = false, $allowNewline = false) { - if (is_string($allowNewline)) { - $validChars = $allowNewline; - } else { - $validChars = $allowNewline ? "." : "[^\n]"; - } - if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) return false; - if ($until) $this->count -= strlen($what); // give back $what - $out = $m[1]; - return true; - } - - // try to match something on head of buffer - protected function match($regex, &$out, $eatWhitespace = null) { - if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault; - - $r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais'; - if (preg_match($r, $this->buffer, $out, null, $this->count)) { - $this->count += strlen($out[0]); - if ($eatWhitespace && $this->writeComments) $this->whitespace(); - return true; - } - return false; - } - - // match some whitespace - protected function whitespace() { - if ($this->writeComments) { - $gotWhite = false; - while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) { - if (isset($m[1]) && empty($this->seenComments[$this->count])) { - $this->append(array("comment", $m[1])); - $this->seenComments[$this->count] = true; - } - $this->count += strlen($m[0]); - $gotWhite = true; - } - return $gotWhite; - } else { - $this->match("", $m); - return strlen($m[0]) > 0; - } - } - - // match something without consuming it - protected function peek($regex, &$out = null, $from=null) { - if (is_null($from)) $from = $this->count; - $r = '/'.$regex.'/Ais'; - $result = preg_match($r, $this->buffer, $out, null, $from); - - return $result; - } - - // seek to a spot in the buffer or return where we are on no argument - protected function seek($where = null) { - if ($where === null) return $this->count; - else $this->count = $where; - return true; - } - - /* misc functions */ - - public function throwError($msg = "parse error", $count = null) { - $count = is_null($count) ? $this->count : $count; - - $line = $this->line + - substr_count(substr($this->buffer, 0, $count), "\n"); - - if (!empty($this->sourceName)) { - $loc = "$this->sourceName on line $line"; - } else { - $loc = "line: $line"; - } - - // TODO this depends on $this->count - if ($this->peek("(.*?)(\n|$)", $m, $count)) { - throw new exception("$msg: failed at `$m[1]` $loc"); - } else { - throw new exception("$msg: $loc"); - } - } - - protected function pushBlock($selectors=null, $type=null) { - $b = new stdclass; - $b->parent = $this->env; - - $b->type = $type; - $b->id = self::$nextBlockId++; - - $b->isVararg = false; // TODO: kill me from here - $b->tags = $selectors; - - $b->props = array(); - $b->children = array(); - - $this->env = $b; - return $b; - } - - // push a block that doesn't multiply tags - protected function pushSpecialBlock($type) { - return $this->pushBlock(null, $type); - } - - // append a property to the current block - protected function append($prop, $pos = null) { - if ($pos !== null) $prop[-1] = $pos; - $this->env->props[] = $prop; - } - - // pop something off the stack - protected function pop() { - $old = $this->env; - $this->env = $this->env->parent; - return $old; - } - - // remove comments from $text - // todo: make it work for all functions, not just url - protected function removeComments($text) { - $look = array( - 'url(', '//', '/*', '"', "'" - ); - - $out = ''; - $min = null; - while (true) { - // find the next item - foreach ($look as $token) { - $pos = strpos($text, $token); - if ($pos !== false) { - if (!isset($min) || $pos < $min[1]) $min = array($token, $pos); - } - } - - if (is_null($min)) break; - - $count = $min[1]; - $skip = 0; - $newlines = 0; - switch ($min[0]) { - case 'url(': - if (preg_match('/url\(.*?\)/', $text, $m, 0, $count)) - $count += strlen($m[0]) - strlen($min[0]); - break; - case '"': - case "'": - if (preg_match('/'.$min[0].'.*?(?indentLevel = 0; - } - - public function indentStr($n = 0) { - return str_repeat($this->indentChar, max($this->indentLevel + $n, 0)); - } - - public function property($name, $value) { - return $name . $this->assignSeparator . $value . ";"; - } - - protected function isEmpty($block) { - if (empty($block->lines)) { - foreach ($block->children as $child) { - if (!$this->isEmpty($child)) return false; - } - - return true; - } - return false; - } - - public function block($block) { - if ($this->isEmpty($block)) return; - - $inner = $pre = $this->indentStr(); - - $isSingle = !$this->disableSingle && - is_null($block->type) && count($block->lines) == 1; - - if (!empty($block->selectors)) { - $this->indentLevel++; - - if ($this->breakSelectors) { - $selectorSeparator = $this->selectorSeparator . $this->break . $pre; - } else { - $selectorSeparator = $this->selectorSeparator; - } - - echo $pre . - implode($selectorSeparator, $block->selectors); - if ($isSingle) { - echo $this->openSingle; - $inner = ""; - } else { - echo $this->open . $this->break; - $inner = $this->indentStr(); - } - - } - - if (!empty($block->lines)) { - $glue = $this->break.$inner; - echo $inner . implode($glue, $block->lines); - if (!$isSingle && !empty($block->children)) { - echo $this->break; - } - } - - foreach ($block->children as $child) { - $this->block($child); - } - - if (!empty($block->selectors)) { - if (!$isSingle && empty($block->children)) echo $this->break; - - if ($isSingle) { - echo $this->closeSingle . $this->break; - } else { - echo $pre . $this->close . $this->break; - } - - $this->indentLevel--; - } - } -} - -class lessc_formatter_compressed extends lessc_formatter_classic { - public $disableSingle = true; - public $open = "{"; - public $selectorSeparator = ","; - public $assignSeparator = ":"; - public $break = ""; - public $compressColors = true; - - public function indentStr($n = 0) { - return ""; - } -} - -class lessc_formatter_lessjs extends lessc_formatter_classic { - public $disableSingle = true; - public $breakSelectors = true; - public $assignSeparator = ": "; - public $selectorSeparator = ","; -} diff --git a/bibli/parsedown/ParsedownExtra.php b/bibli/parsedown/ParsedownExtra.php new file mode 100644 index 0000000..632ba84 --- /dev/null +++ b/bibli/parsedown/ParsedownExtra.php @@ -0,0 +1,538 @@ +BlockTypes[':'] []= 'DefinitionList'; + $this->BlockTypes['*'] []= 'Abbreviation'; + + # identify footnote definitions before reference definitions + array_unshift($this->BlockTypes['['], 'Footnote'); + + # identify footnote markers before before links + array_unshift($this->InlineTypes['['], 'FootnoteMarker'); + } + + # + # ~ + + function text($text) + { + $markup = parent::text($text); + + # merge consecutive dl elements + + $markup = preg_replace('/<\/dl>\s+
\s+/', '', $markup); + + # add footnotes + + if (isset($this->DefinitionData['Footnote'])) + { + $Element = $this->buildFootnoteElement(); + + $markup .= "\n" . $this->element($Element); + } + + return $markup; + } + + # + # Blocks + # + + # + # Abbreviation + + protected function blockAbbreviation($Line) + { + if (preg_match('/^\*\[(.+?)\]:[ ]*(.+?)[ ]*$/', $Line['text'], $matches)) + { + $this->DefinitionData['Abbreviation'][$matches[1]] = $matches[2]; + + $Block = array( + 'hidden' => true, + ); + + return $Block; + } + } + + # + # Footnote + + protected function blockFootnote($Line) + { + if (preg_match('/^\[\^(.+?)\]:[ ]?(.*)$/', $Line['text'], $matches)) + { + $Block = array( + 'label' => $matches[1], + 'text' => $matches[2], + 'hidden' => true, + ); + + return $Block; + } + } + + protected function blockFootnoteContinue($Line, $Block) + { + if ($Line['text'][0] === '[' and preg_match('/^\[\^(.+?)\]:/', $Line['text'])) + { + return; + } + + if (isset($Block['interrupted'])) + { + if ($Line['indent'] >= 4) + { + $Block['text'] .= "\n\n" . $Line['text']; + + return $Block; + } + } + else + { + $Block['text'] .= "\n" . $Line['text']; + + return $Block; + } + } + + protected function blockFootnoteComplete($Block) + { + $this->DefinitionData['Footnote'][$Block['label']] = array( + 'text' => $Block['text'], + 'count' => null, + 'number' => null, + ); + + return $Block; + } + + # + # Definition List + + protected function blockDefinitionList($Line, $Block) + { + if ( ! isset($Block) or isset($Block['type'])) + { + return; + } + + $Element = array( + 'name' => 'dl', + 'handler' => 'elements', + 'text' => array(), + ); + + $terms = explode("\n", $Block['element']['text']); + + foreach ($terms as $term) + { + $Element['text'] []= array( + 'name' => 'dt', + 'handler' => 'line', + 'text' => $term, + ); + } + + $Block['element'] = $Element; + + $Block = $this->addDdElement($Line, $Block); + + return $Block; + } + + protected function blockDefinitionListContinue($Line, array $Block) + { + if ($Line['text'][0] === ':') + { + $Block = $this->addDdElement($Line, $Block); + + return $Block; + } + else + { + if (isset($Block['interrupted']) and $Line['indent'] === 0) + { + return; + } + + if (isset($Block['interrupted'])) + { + $Block['dd']['handler'] = 'text'; + $Block['dd']['text'] .= "\n\n"; + + unset($Block['interrupted']); + } + + $text = substr($Line['body'], min($Line['indent'], 4)); + + $Block['dd']['text'] .= "\n" . $text; + + return $Block; + } + } + + # + # Header + + protected function blockHeader($Line) + { + $Block = parent::blockHeader($Line); + + if (! isset($Block)) { + return null; + } + + if (preg_match('/[ #]*{('.$this->regexAttribute.'+)}[ ]*$/', $Block['element']['text'], $matches, PREG_OFFSET_CAPTURE)) + { + $attributeString = $matches[1][0]; + + $Block['element']['attributes'] = $this->parseAttributeData($attributeString); + + $Block['element']['text'] = substr($Block['element']['text'], 0, $matches[0][1]); + } + + return $Block; + } + + # + # Markup + + protected function blockMarkupComplete($Block) + { + if ( ! isset($Block['void'])) + { + $Block['markup'] = $this->processTag($Block['markup']); + } + + return $Block; + } + + # + # Setext + + protected function blockSetextHeader($Line, array $Block = null) + { + $Block = parent::blockSetextHeader($Line, $Block); + + if (! isset($Block)) { + return null; + } + + if (preg_match('/[ ]*{('.$this->regexAttribute.'+)}[ ]*$/', $Block['element']['text'], $matches, PREG_OFFSET_CAPTURE)) + { + $attributeString = $matches[1][0]; + + $Block['element']['attributes'] = $this->parseAttributeData($attributeString); + + $Block['element']['text'] = substr($Block['element']['text'], 0, $matches[0][1]); + } + + return $Block; + } + + # + # Inline Elements + # + + # + # Footnote Marker + + protected function inlineFootnoteMarker($Excerpt) + { + if (preg_match('/^\[\^(.+?)\]/', $Excerpt['text'], $matches)) + { + $name = $matches[1]; + + if ( ! isset($this->DefinitionData['Footnote'][$name])) + { + return; + } + + $this->DefinitionData['Footnote'][$name]['count'] ++; + + if ( ! isset($this->DefinitionData['Footnote'][$name]['number'])) + { + $this->DefinitionData['Footnote'][$name]['number'] = ++ $this->footnoteCount; # » & + } + + $Element = array( + 'name' => 'sup', + 'attributes' => array('id' => 'fnref'.$this->DefinitionData['Footnote'][$name]['count'].':'.$name), + 'handler' => 'element', + 'text' => array( + 'name' => 'a', + 'attributes' => array('href' => '#fn:'.$name, 'class' => 'footnote-ref'), + 'text' => $this->DefinitionData['Footnote'][$name]['number'], + ), + ); + + return array( + 'extent' => strlen($matches[0]), + 'element' => $Element, + ); + } + } + + private $footnoteCount = 0; + + # + # Link + + protected function inlineLink($Excerpt) + { + $Link = parent::inlineLink($Excerpt); + + if (! isset($Link)) { + return null; + } + + $remainder = substr($Excerpt['text'], $Link['extent']); + + if (preg_match('/^[ ]*{('.$this->regexAttribute.'+)}/', $remainder, $matches)) + { + $Link['element']['attributes'] += $this->parseAttributeData($matches[1]); + + $Link['extent'] += strlen($matches[0]); + } + + return $Link; + } + + # + # ~ + # + + protected function unmarkedText($text) + { + $text = parent::unmarkedText($text); + + if (isset($this->DefinitionData['Abbreviation'])) + { + foreach ($this->DefinitionData['Abbreviation'] as $abbreviation => $meaning) + { + $pattern = '/\b'.preg_quote($abbreviation, '/').'\b/'; + + $text = preg_replace($pattern, ''.$abbreviation.'', $text); + } + } + + return $text; + } + + # + # Util Methods + # + + protected function addDdElement(array $Line, array $Block) + { + $text = substr($Line['text'], 1); + $text = trim($text); + + unset($Block['dd']); + + $Block['dd'] = array( + 'name' => 'dd', + 'handler' => 'line', + 'text' => $text, + ); + + if (isset($Block['interrupted'])) + { + $Block['dd']['handler'] = 'text'; + + unset($Block['interrupted']); + } + + $Block['element']['text'] []= & $Block['dd']; + + return $Block; + } + + protected function buildFootnoteElement() + { + $Element = array( + 'name' => 'div', + 'attributes' => array('class' => 'footnotes'), + 'handler' => 'elements', + 'text' => array( + array( + 'name' => 'hr', + ), + array( + 'name' => 'ol', + 'handler' => 'elements', + 'text' => array(), + ), + ), + ); + + uasort($this->DefinitionData['Footnote'], 'self::sortFootnotes'); + + foreach ($this->DefinitionData['Footnote'] as $definitionId => $DefinitionData) + { + if ( ! isset($DefinitionData['number'])) + { + continue; + } + + $text = $DefinitionData['text']; + + $text = parent::text($text); + + $numbers = range(1, $DefinitionData['count']); + + $backLinksMarkup = ''; + + foreach ($numbers as $number) + { + $backLinksMarkup .= ' '; + } + + $backLinksMarkup = substr($backLinksMarkup, 1); + + if (substr($text, - 4) === '

') + { + $backLinksMarkup = ' '.$backLinksMarkup; + + $text = substr_replace($text, $backLinksMarkup.'

', - 4); + } + else + { + $text .= "\n".'

'.$backLinksMarkup.'

'; + } + + $Element['text'][1]['text'] []= array( + 'name' => 'li', + 'attributes' => array('id' => 'fn:'.$definitionId), + 'rawHtml' => "\n".$text."\n", + ); + } + + return $Element; + } + + # ~ + + protected function parseAttributeData($attributeString) + { + $Data = array(); + + $attributes = preg_split('/[ ]+/', $attributeString, - 1, PREG_SPLIT_NO_EMPTY); + + foreach ($attributes as $attribute) + { + if ($attribute[0] === '#') + { + $Data['id'] = substr($attribute, 1); + } + else # "." + { + $classes []= substr($attribute, 1); + } + } + + if (isset($classes)) + { + $Data['class'] = implode(' ', $classes); + } + + return $Data; + } + + # ~ + + protected function processTag($elementMarkup) # recursive + { + # http://stackoverflow.com/q/1148928/200145 + libxml_use_internal_errors(true); + + $DOMDocument = new DOMDocument; + + # http://stackoverflow.com/q/11309194/200145 + $elementMarkup = mb_convert_encoding($elementMarkup, 'HTML-ENTITIES', 'UTF-8'); + + # http://stackoverflow.com/q/4879946/200145 + $DOMDocument->loadHTML($elementMarkup); + $DOMDocument->removeChild($DOMDocument->doctype); + $DOMDocument->replaceChild($DOMDocument->firstChild->firstChild->firstChild, $DOMDocument->firstChild); + + $elementText = ''; + + if ($DOMDocument->documentElement->getAttribute('markdown') === '1') + { + foreach ($DOMDocument->documentElement->childNodes as $Node) + { + $elementText .= $DOMDocument->saveHTML($Node); + } + + $DOMDocument->documentElement->removeAttribute('markdown'); + + $elementText = "\n".$this->text($elementText)."\n"; + } + else + { + foreach ($DOMDocument->documentElement->childNodes as $Node) + { + $nodeMarkup = $DOMDocument->saveHTML($Node); + + if ($Node instanceof DOMElement and ! in_array($Node->nodeName, $this->textLevelElements)) + { + $elementText .= $this->processTag($nodeMarkup); + } + else + { + $elementText .= $nodeMarkup; + } + } + } + + # because we don't want for markup to get encoded + $DOMDocument->documentElement->nodeValue = 'placeholder\x1A'; + + $markup = $DOMDocument->saveHTML($DOMDocument->documentElement); + $markup = str_replace('placeholder\x1A', $elementText, $markup); + + return $markup; + } + + # ~ + + protected function sortFootnotes($A, $B) # callback + { + return $A['number'] - $B['number']; + } + + # + # Fields + # + + protected $regexAttribute = '(?:[#.][-\w]+[ ]*)'; +} diff --git a/bibli/static-compress b/bibli/static-compress new file mode 100755 index 0000000..ec44939 Binary files /dev/null and b/bibli/static-compress differ diff --git a/cgu.php b/cgu.php deleted file mode 100755 index 4f6e275..0000000 --- a/cgu.php +++ /dev/null @@ -1,81 +0,0 @@ - - - -

Conditions générales d'utilisation

- -
- -
-

Préambule

-

- L'utilisation des services Antopie vous lie aux conditions suivantes.
- Antopie se réserve le droit de mettre à jour et modifier ces conditions à tout moment.
- Ces conditions sont dérivées de celles de Framasoft. -

-
- -
-

Conditions des services

- -
    -
  • Vous êtes responsable de la sécurité de votre compte et de - votre mot de passe.
  • -
  • Vous êtes responsable de tout contenu affiché et de l’activité - qui se produit sous votre compte.
  • -
  • Vous ne pouvez pas vendre, échanger ou exploiter - dans un but commercial un compte du service - utilisé.
  • -
  • L’échec d'Antopie à exercer ou à appliquer tout droit ou - disposition des Conditions d’utilisation ne constitue - pas une renonciation à ce droit ou à cette disposition.
  • -
  • Les conditions d'utilisation actuelles remplacent les anciennes versions. -
  • -
  • - Vous ne devez pas tenter de nuire aux services Antopie ou à celleux les utilisant. -
  • -
  • Les services étant hébergés en France par une personne de nationnalité française, - vous devez respecter au moins la législation en vigueur en France. -
  • -
  • - Savoir orthographier correctement le mot « spatule » n'est pas nécessaire pour utiliser les services Antopie. -
  • - - - - - -
- -

Garantie

- -
    -
  • Antopie se dégage de toutes responsabilités dans la limite - de la loi.
  • -
  • Antopie se réserve le droit, à tout moment de modifier ou - d’interrompre, temporairement ou définitivement, le service - avec ou sans préavis.
  • -
- -

Données personnelles

- -
    -
  • Conformément à l’article 34 de la loi « Informatique et Libertés », - Antopie garantit à l’utilisateurice un droit d’opposition, d’accès et de - rectification sur les données nominatives læ concernant. L'utilisateurice - a la possibilité d’exercer ce droit en envoyant un - email à l'admin.
  • -
  • Malgré ce que certaines interfaces pourraient laisser penser, - il n'est jamais nécessaire de révéler votre identité pour utiliser les services.
  • -
  • Tout comme d’autres services en ligne, Antopie enregistre - automatiquement certaines informations concernant votre - utilisation du service (exemple : type de navigateur, adresse IP, date et - heure de l’accès, URL de référence).
    - Ces données ne sont ni vendues, ni transmises à des tiers, dans la limite de la loi. -
  • -
-
- -
- - diff --git a/clr.php b/clr.php index f9e1c64..0b03237 100755 --- a/clr.php +++ b/clr.php @@ -1,17 +1,124 @@ + 1) { + $h -= 1; + }; +}; + +$h2 = $h + 0.5; + +if ($h2 > 1) { + $h2 -= 1; +}; + +if ($s == 0) { + $r = $l * 255; + $g = $l * 255; + $b = $l * 255; +} else { + if ($l < 0.5) { + $var_2 = $l * (1 + $s); + } else { + $var_2 = ($l + $s) - ($s * $l); + }; + + $var_1 = 2 * $l - $var_2; + $r = 255 * hue_2_rgb($var_1,$var_2,$h2 + (1 / 3)); + $g = 255 * hue_2_rgb($var_1,$var_2,$h2); + $b = 255 * hue_2_rgb($var_1,$var_2,$h2 - (1 / 3)); +}; + +function hue_2_rgb($v1,$v2,$vh) { + + if ($vh < 0) { + $vh += 1; + }; + + if ($vh > 1) { + $vh -= 1; + }; + + if ((6 * $vh) < 1) { + return ($v1 + ($v2 - $v1) * 6 * $vh); + }; + + if ((2 * $vh) < 1) { + return ($v2); + }; + + if ((3 * $vh) < 2) { + return ($v1 + ($v2 - $v1) * ((2 / 3 - $vh) * 6)); + }; + + return ($v1); +}; + +$rhex = sprintf("%02X",round($r)); +$ghex = sprintf("%02X",round($g)); +$bhex = sprintf("%02X",round($b)); + +$rgbhex = $rhex . $ghex . $bhex; + +?> - + <?php - echo $clr; + echo "#" . $clr; if (isset($_GET['txt'])) echo " " . htmlspecialchars($_GET['txt']); ?> @@ -19,31 +126,37 @@ <style> body { - background-color: <?php echo $clr; ?>; + background-color: <?php echo "#" . $clr; ?>; } #txt { - font-family: "Ubuntu", system-ui, sans-serif; + font-family: "Ubuntu", sans-serif; font-size: 50px; - margin: 10px; - background-color: black; - color: white; + color: <?php echo "#" . $rgbhex; ?>; padding: 10px; - border-radius: 0px; - position: fixed; - top: 20%; - left: 20%; - right: 20%; + position: absolute; text-align: center; + + margin-left: auto; + margin-right: auto; + margin-bottom: auto; + margin-top: auto; + width: 90%; + + left: 50%; + top: 50%; + transform: translate(-50%,-50%); } + + + </style> </head> <body> - <?php if (isset($_GET['txt'])) { ?> - <div id=txt> - <?php echo htmlspecialchars($_GET['txt']); ?> - </div> - <?php } ?> + <?php if (isset($_GET['txt'])) { ?> + <div id="txt"><?php echo htmlspecialchars($_GET['txt']); ?></div> + <?php } ?> + </body> </html> diff --git a/compil.php b/compil.php new file mode 100644 index 0000000..e47b5eb --- /dev/null +++ b/compil.php @@ -0,0 +1,57 @@ +<?php +require "mdp.php"; +if (isset($_GET['pw']) AND $_GET['pw'] == $mdp) { + + require "bibli/parsedown/Parsedown.php"; + require "bibli/parsedown/ParsedownExtra.php"; + $nomsPages = array_diff(scandir("pages"), array('..', '.')); + foreach ($nomsPages as $nomPage) { + $nomPage = basename($nomPage, ".md"); + + // pages/exemple.md > temp/exemple.temp + // Exécute le HTML/PHP avec header et footer vers du HTML statique + ob_start(); + require "pages/" . $nomPage . ".md"; + file_put_contents("temp/" . $nomPage . ".temp", ob_get_contents()); + ob_end_clean(); + + // temp/exemple.temp > temp2/exemple.temp2 + // Compile le Markdown/PHP vers du HTML/PHP + $contenuPage = ParsedownExtra::instance() + ->setUrlsLinked(false) + ->setMarkupEscaped(false) + ->setBreaksEnabled(true) + ->text(file_get_contents("temp/" .$nomPage . ".temp")); + file_put_contents("temp2/" . $nomPage . ".temp2", $contenuPage); + + // temp2/exemple.temp2 > exemple.html + // Exécute et cache le PHP en HTML + $adresse = $nomPage; + ob_start(); + require "inc/pages.php"; + require "inc/debut.php"; + if ($page['type'] == "article") { + echo "<h1>" . $page['h1'] . "</h1>"; + echo "<article>"; + } else if ($page['type'] == "centré") { + echo "<div class='centre'>"; + } + require "temp2/" . $nomPage . ".temp2"; + if ($page['type'] == "article") { + echo "</article>"; + } else if ($page['type'] == "centré") { + echo "</div>"; + } + require "inc/footer.php"; + file_put_contents($nomPage . ".html", ob_get_contents()); + ob_end_clean(); + + } + + // exemple.html > exemple.html.gz + // Compresse les fichiers textes statiques HTML & CSS à la racine + exec('bibli/static-compress -c zopfli "*.html" "*.css"'); + +} else { + echo "Non authentifié·e"; +} diff --git a/details-techniques.php b/details-techniques.php deleted file mode 100644 index 6a7896c..0000000 --- a/details-techniques.php +++ /dev/null @@ -1,61 +0,0 @@ - -<?php include "inc/debut.php"; -head("details-techniques.php"); ?> - -<h1>Détails techniques sur l'infrastructure d'Antopie</h1> - -<article> - - <h2>Matériel</h2> - - Une tour nommée Pastèque avec : - - <ul> - <li>12 Go de RAM</li> - <li>Disque dur d'1,5 To</li> - <li>Intel Core i5 64 bits 4 cœurs 3.4GHz</li> - </ul> - - <h2>Système</h2> - - <a href="https://yunohost.org/">YunoHost</a> 3.8 (basé sur <a href="https://www.debian.org/">Debian</a> 9) et son écosystème : Nginx, Postfix, Fail2ban... - - <h2>DNS</h2> - - Le domaine <code>antopie.org</code> est enregistré chez <a href="https://www.gandi.net/">Gandi</a> et administré sur leur interface Web LiveDNS. - <br> - <a href="https://fr.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">DNSSEC</a> est activé dessus. - <br> - Il est enregistré dans la <a href="https://hstspreload.org">HSTS Preload List</a>. - - <h2>Internet</h2> - - Pastèque est connectée à Internet via une connexion du FAI Free en fibre optique (FTTH) à Paris. - <br> - Le débit maximal disponible varie entre 50 Mo/s (400 Mbit/s) et 100 Mo/s (800 Mbit/s). - <br> - Adresse IPv6 : <code>2a01:e34:ec23:b760:5604:a6ff:fec4:58bd</code> - <br> - Adresse IPv4 : <code>78.194.59.118</code> - <br> - En raison d'un problème de mails, Pastèque utilise actuellement et temporairement un VPN de <a href="https://milkywan.fr/">MilkyWan</a>. - <br> - Adresse IPv6 du VPN : <code>2a0b:cbc0:1103:2::106f</code> - <br> - Adresse IPv4 du VPN : <code>45.13.104.169</code> - - <h2>Sauvegarde</h2> - - Des sauvegardes sont faites régulièrement avec le <a href="https://yunohost.org/#/backup">système intégré à YunoHost</a>. - <br> - PeerTube et Nextcloud ne sont pas sauvegardées car cela prendrait trop de place. - <br> - Les sauvegardes sont copiées sur un disque dans la même pièce. - - <h2>Relai Tor</h2> - - Pastèque héberge aussi <a href="https://metrics.torproject.org/rs.html#details/BE8737597F2E6B4F805893202C935125829A902E">un relai Tor</a>. Il ne tourne pas quand le VPN est actif. - -</article> - -<?php include "inc/footer.php"; ?> diff --git a/gomez.min.css.gz b/gomez.min.css.gz deleted file mode 100644 index 38cdfa4..0000000 Binary files a/gomez.min.css.gz and /dev/null differ diff --git a/img/ant-origine.png b/img/ant-origine.png deleted file mode 100644 index 55a4655..0000000 Binary files a/img/ant-origine.png and /dev/null differ diff --git a/img/antopiev5-500.png b/img/antopiev5-500.png new file mode 100644 index 0000000..7525e64 Binary files /dev/null and b/img/antopiev5-500.png differ diff --git a/img/antopiev5-600.png b/img/antopiev5-600.png deleted file mode 100644 index 81ce363..0000000 Binary files a/img/antopiev5-600.png and /dev/null differ diff --git a/img/antpetit.png b/img/antpetit.png deleted file mode 100644 index 774d8ee..0000000 Binary files a/img/antpetit.png and /dev/null differ diff --git a/img/antpetitgris.png b/img/antpetitgris.png deleted file mode 100644 index 41fa71d..0000000 Binary files a/img/antpetitgris.png and /dev/null differ diff --git a/img/docs/config-thunderbird.png b/img/docs/config-thunderbird.png new file mode 100644 index 0000000..c08dc02 Binary files /dev/null and b/img/docs/config-thunderbird.png differ diff --git a/img/docs/k9-imap-300.png b/img/docs/k9-imap-300.png new file mode 100644 index 0000000..80d6339 Binary files /dev/null and b/img/docs/k9-imap-300.png differ diff --git a/img/docs/k9-imap.png b/img/docs/k9-imap.png new file mode 100644 index 0000000..a57965d Binary files /dev/null and b/img/docs/k9-imap.png differ diff --git a/img/docs/k9-smtp-300.png b/img/docs/k9-smtp-300.png new file mode 100644 index 0000000..fc0744c Binary files /dev/null and b/img/docs/k9-smtp-300.png differ diff --git a/img/docs/k9-smtp.png b/img/docs/k9-smtp.png new file mode 100644 index 0000000..0b03c5a Binary files /dev/null and b/img/docs/k9-smtp.png differ diff --git a/img/docs/nextcloud-files-zoom.png b/img/docs/nextcloud-files-zoom.png new file mode 100644 index 0000000..313a1a2 Binary files /dev/null and b/img/docs/nextcloud-files-zoom.png differ diff --git a/img/docs/nextcloud-files.png b/img/docs/nextcloud-files.png new file mode 100644 index 0000000..512217e Binary files /dev/null and b/img/docs/nextcloud-files.png differ diff --git a/img/logos/diagrams.png b/img/logos/diagrams.png index f3a5895..20b4c1d 100644 Binary files a/img/logos/diagrams.png and b/img/logos/diagrams.png differ diff --git a/img/logos/etherpad-colibris.png b/img/logos/etherpad-colibris.png index c2a3473..63d2fce 100644 Binary files a/img/logos/etherpad-colibris.png and b/img/logos/etherpad-colibris.png differ diff --git a/img/logos/etherpad-favicon.png b/img/logos/etherpad-favicon.png index 5827278..8009cd9 100644 Binary files a/img/logos/etherpad-favicon.png and b/img/logos/etherpad-favicon.png differ diff --git a/img/logos/etherpad.png b/img/logos/etherpad.png index 1e413ac..d596958 100644 Binary files a/img/logos/etherpad.png and b/img/logos/etherpad.png differ diff --git a/img/logos/qr.png b/img/logos/libreqr.png similarity index 100% rename from img/logos/qr.png rename to img/logos/libreqr.png diff --git a/img/logos/opensondage.png b/img/logos/opensondage.png index 9c8cda3..1703d9f 100644 Binary files a/img/logos/opensondage.png and b/img/logos/opensondage.png differ diff --git a/img/logos/searx.png b/img/logos/searx.png index b2a0977..43a5da6 100644 Binary files a/img/logos/searx.png and b/img/logos/searx.png differ diff --git a/img/lri.png b/img/lri.png deleted file mode 100644 index 58308ae..0000000 Binary files a/img/lri.png and /dev/null differ diff --git a/inc/debut.php b/inc/debut.php index b5aa9c2..630425c 100755 --- a/inc/debut.php +++ b/inc/debut.php @@ -1,65 +1,49 @@ <?php -function head($adresse) { - require "url.php"; + $adresse = basename($_SERVER['PHP_SELF'], '.php'); - require "page.php"; + require_once "url.php"; ?> <!DOCTYPE html> - <html lang="fr" id="haut"> + <html lang="fr"> <head> <meta charset="UTF-8"> - <title><?php echo $page['titre']; ?> · Antopie + <?php echo $page['titre']; ?> - - - -setFormatter("compressed"); $less->checkedCompile("style.less", "style.min.css"); ?> setFormatter("compressed"); - $less->checkedCompile("bibli/gomez.css", "gomez.min.css"); ?> - + $less->checkedCompile("bibli/gomez/gomez.css", "bibli/gomez/gomez.min.css"); ?> + -
- +
- diff --git a/inc/footer.php b/inc/footer.php index cbac8c9..6ee9df9 100755 --- a/inc/footer.php +++ b/inc/footer.php @@ -3,16 +3,11 @@ diff --git a/inc/page.php b/inc/page.php deleted file mode 100755 index 4978e24..0000000 --- a/inc/page.php +++ /dev/null @@ -1,30 +0,0 @@ - - -
- -

- Antopie propose des services Internet, administrés par et hébergés chez ">Miraty grâce à YunoHost. -

-

- Le compte @Antopie@miaou.drycat.fr (RSS) informe des pannes, mises à jour et nouveaux services. -

- - " class="bouton">Manifeste sur le contenu - " class="bouton">Détails techniques - " class="bouton">Conditions d'utilisation - -
- - - - -
- - 'plume.png', - 'peertube' => 'peertube.png', - 'gitea' => 'gitea.png', - 'libreqr' => 'qr.png', - 'bitwarden' => 'bitwarden.png', - 'nextcloud' => 'nextcloud.png', - 'synapse' => 'matrix.png', - 'riot' => 'riot.png', - 'privatebin' => 'privatebin.png', - 'jirafeau' => 'jirafeau.png', - 'rssbridge' => 'rssbridge.png', - 'searx' => 'searx.png', - 'etherpad' => 'etherpad.png', - 'diagrams' => 'diagrams.png', - 'opensondage' => 'opensondage.png', -); - -$urlService = array( - 'plume' => clearnetOrOnion('https://blog.antopie.org', 'http://antblogn2vnc4hncjiow4jn7yidxe64l2o2qhj2tyla33jjhrrf5v2ad.onion'), - 'peertube' => 'https://video.antopie.org', - 'gitea' => clearnetOrOnion('https://code.antopie.org', 'http://antcode5h4tntfei362x7eydifyxdjskjisv5pezk2othlh7oho2zhyd.onion'), - 'libreqr' => clearnetOrOnion('https://qr.antopie.org', 'http://libreqrh5gsyzaaexx4vwyp6k2sd5keg5svyj2gpbkhg7zzyjvswiiyd.onion'), - 'bitwarden' => clearnetOrOnion('https://mdp.antopie.org', 'http://antmdpizuaquzfz5kzv3tz3k2funlcgma5gxtujxs5sl6z7wyk76x3qd.onion'), - 'nextcloud' => 'https://nuage.antopie.org', - 'synapse' => 'https://matrix.antopie.org', - 'riot' => 'https://riot.antopie.org', - 'privatebin' => clearnetOrOnion('https://texte.antopie.org', 'http://anttxt2u75lbrpl23szr6qtgzx5kkcz7larjmg24udwypceuslzel5qd.onion'), - 'jirafeau' => clearnetOrOnion('https://up.antopie.org', 'http://antuplo4vcln7ftoatr5iualwb3py7ccii6t32gemzannhu4blj2xqid.onion'), - 'rssbridge' => clearnetOrOnion('https://rss.antopie.org', 'http://antrssv5553pjemejxyszija6ceii4soc5ozk6pdj7y3vauzioavdkid.onion'), - 'searx' => clearnetOrOnion('https://searx.antopie.org', 'http://antsrxhuvxylfgvu6c33m6gzlp3dsrxfnil7z3ppfya2vqvs4hkuy7qd.onion'), - 'etherpad' => 'https://pad.antopie.org', - 'diagrams' => 'https://draw.antopie.org', - 'opensondage' => clearnetOrOnion('https://sondage.antopie.org', 'http://antaskuzziqjodxfighsptanvhrwmb7h5nsgjwei2dvvtsuqgjsaxvad.onion'), -); - -$nomService = array( - 'plume' => 'Plume', - 'peertube' => 'PeerTube', - 'gitea' => 'Gitea', - 'libreqr' => 'LibreQR', - 'bitwarden' => 'Bitwarden', - 'nextcloud' => 'Nextcloud', - 'synapse' => 'Synapse', - 'riot' => 'Riot', - 'privatebin' => 'PrivateBin', - 'jirafeau' => 'Jirafeau', - 'rssbridge' => 'RSS Bridge', - 'searx' => 'Searx', - 'etherpad' => 'Etherpad', - 'diagrams' => 'Diagrammes', - 'opensondage' => 'OpenSondage', -); - -$infoThemeService = array( - 'plume' => 'Thème sombre & rouge', - 'peertube' => 'Thème rouge', - 'gitea' => 'Thème sombre', - 'libreqr' => 'Thème sombre', - 'bitwarden' => NULL, - 'nextcloud' => 'Thème sombre', - 'synapse' => NULL, - 'riot' => NULL, - 'privatebin' => 'Thème sombre', - 'jirafeau' => 'Thème sombre', - 'rssbridge' => 'Thème sombre & rouge', - 'searx' => 'Thème sombre', - 'etherpad' => NULL, - 'diagrams' => NULL, - 'opensondage' => NULL, -); - -$descService = array( - 'plume' => 'Créez simplement un blog qui sera accessible via le Web, le Fédiverse et un flux Atom.', - 'peertube' => 'Regardez ou publiez des vidéos sur le Fédiverse en pair à pair.', - 'gitea' => 'Forge logicielle simple basée sur Git.', - 'libreqr' => "Un générateur de codes QR fait maison.", - 'bitwarden' => 'Générez, enregistrez et synchronisez des mots ou phrases de passe fortes.', - 'nextcloud' => 'Synchronisation de fichiers, de contacts (CardDAV), d’agenda (CalDAV), Carnet , et plein d’autres fonctionnalités grâce à des extensions.', - 'synapse' => 'Un serveur Matrix, qui est un protocole internet moderne pour la communication écrite, audio ou vidéo.', - 'riot' => 'Client Web pour Matrix.', - 'privatebin' => 'Partagez des textes, codes sources ou Markdown rapidement.', - 'jirafeau' => 'Partagez rapidement n’importe quel fichier avec n’importe qui.', - 'rssbridge' => 'Exportez les données de centaines de sites aux formats Atom, JSON, HTML, Mrss ou texte.', - 'searx' => 'Métamoteur anonymé : combine plusieurs moteurs de recherche sur une seule page.', - 'etherpad' => 'Éditez un texte sur plusieurs appareils en même temps. Utilisable avec MyPads.', - 'diagrams' => 'Créez des graphiques pour représenter des idées.', - 'opensondage' => 'Planifiez un rendez-vous ou prenez des décisions.' -); - -$siteOfficielService = array( - 'plume' => 'joinplu.me', - 'peertube' => 'joinpeertube.org', - 'gitea' => 'gitea.io', - 'libreqr' => NULL, - 'bitwarden' => 'bitwarden.com', - 'nextcloud' => 'nextcloud.com/fr_FR', - 'synapse' => NULL, - 'riot' => 'about.riot.im', - 'privatebin' => 'privatebin.info', - 'jirafeau' => NULL, - 'rssbridge' => NULL, - 'searx' => 'asciimoo.github.io/searx', - 'etherpad' => 'etherpad.org', - 'diagrams' => 'www.diagrams.net', - 'opensondage' => NULL, -); - -$gitService = array( - 'plume' => 'github.com/Plume-org/Plume', - 'peertube' => 'github.com/Chocobozzz/PeerTube', - 'gitea' => 'github.com/go-gitea/gitea', - 'libreqr' => 'code.antopie.org/miraty/libreqr', - 'bitwarden' => 'github.com/dani-garcia/bitwarden_rs', - 'nextcloud' => 'github.com/nextcloud/server', - 'synapse' => 'github.com/matrix-org/synapse', - 'riot' => 'github.com/vector-im/riot-web', - 'privatebin' => 'github.com/PrivateBin/PrivateBin', - 'jirafeau' => 'gitlab.com/mojo42/Jirafeau', - 'rssbridge' => 'github.com/rss-bridge/rss-bridge', - 'searx' => 'github.com/asciimoo/searx', - 'etherpad' => 'github.com/ether/etherpad-lite', - 'diagrams' => 'github.com/jgraph/drawio', - 'opensondage' => 'framagit.org/framasoft/framadate/framadate' -); - -$paquetYnhService = array( - 'plume' => 'github.com/YunoHost-Apps/plume_ynh', - 'peertube' => 'github.com/YunoHost-Apps/peertube_ynh', - 'gitea' => 'github.com/YunoHost-Apps/gitea_ynh', - 'libreqr' => 'code.antopie.org/miraty/qr_ynh', - 'bitwarden' => 'github.com/YunoHost-Apps/bitwarden_ynh', - 'nextcloud' => 'github.com/YunoHost-Apps/nextcloud_ynh', - 'synapse' => 'github.com/YunoHost-Apps/synapse_ynh', - 'riot' => 'github.com/YunoHost-Apps/riot_ynh', - 'privatebin' => 'github.com/YunoHost-Apps/zerobin_ynh', - 'jirafeau' => 'github.com/YunoHost-Apps/jirafeau_ynh', - 'rssbridge' => 'github.com/YunoHost-Apps/rss-bridge_ynh', - 'searx' => 'github.com/YunoHost-Apps/searx_ynh', - 'etherpad' => 'github.com/YunoHost-Apps/etherpad_mypads_ynh', - 'diagrams' => 'github.com/YunoHost-Apps/diagramsnet_ynh', - 'opensondage' => 'github.com/YunoHost-Apps/opensondage_ynh', -); - - foreach($descService as $codeService => $descService) { ?> -
- -
-
· ·
-
- '; - } ?> - -
-
- - - -
- -
- -

- Vous trouverez également votre IP, agent utilisateur, référent HTTP et langues demandées sur ">cette page. -

- -

- Antopie n'a pas besoin de dons pour être financée, si vous avez toutefois suffisamment d'argent, vous pouvez par exemple soutenir La Quadrature du Net, la v3 de PeerTube ou un projet libre sur Liberapay. -

- -
- Vous pouvez me contacter par mail : miraty+web@antopie.org, le Fédiverse : @miraty@plero.antopie.org ou Matrix : @miraty:matrix.antopie.org. -
- - - diff --git a/manifeste-sur-le-contenu.php b/manifeste-sur-le-contenu.php deleted file mode 100644 index 118c9c0..0000000 --- a/manifeste-sur-le-contenu.php +++ /dev/null @@ -1,67 +0,0 @@ - - -

Manifeste sur le contenu

- -
- - Antopie refuse d'héberger du contenu soutenant une vision du monde droitiste. Cela inclut : - -
    -
  • Fascisme, racisme, capacitisme, essentialisme
  • -
  • Capitalisme, publicité
  • -
  • Sexisme, homophobie, transphobie
  • -
  • Théisme, conspirationnisme, spiritualisme
  • -
- - Antopie encourage la diffusion d'idées gauchistes. Cela inclut : - -
    -
  • Librisme, datalove, kopimisme
  • -
  • Anarchisme, communisme, socialisme
  • -
  • Féminisme, queer
  • -
  • Écologisme, véganisme, décroissance
  • -
  • Éducation populaire, pensée critique
  • -
- -

- L'utilisation de licences libres est encouragée. -

- -

- Les contenus qui n'ont pas spécifiquement d'impact politique sont également les bienvenus. -

- -

- Ces règles s'appliquent principalement aux contenus hébergés publiquement par Antopie sur PeerTube et ">Plume. -

- -

- Les contenus accessibles par la fédération ou par une URL communiquée en privé sont moins concernés pas ce manifeste. -

- -

- Ces règles sont édictées pour que vous puissiez vous faire une idée de la modération et du but d'Antopie. Il ne s'agit pas d'une vérité absolue. Je garde ma liberté de ne pas modérer ou de modérer pour d'autres raisons. -

- -

Ce n'est pas une atteinte à la liberté d'expression

- -

- Internet est un réseau libre et vous y dites ce que vous voulez. Cependant quand vous publiez du contenu par le serveur de quelqu'un d'autre, c'est aux yeux d'Internet cette personne qui s'exprime à votre place. -

- -

- On peut comparer l'hébergement Internet à l'hébergement dans son sens original : vous êtes ici chez moi. Je permet à d'autres de venir discuter chez moi. Mais je ne souhaite pas que vous veniez chez moi pour dire des bêtises. Dans ce cas, je vous invite plutôt à vous taire aller dans une autre maison ou construire la vôtre. -

- -

- L'avantage d'Internet étant que l'on peut passer très rapidement d'une maison à l'autre. -

- -

- Cette comparaison fonctionne surtout car Antopie utilise des logiciels libres : avec des logiciels privateurs, vous ne pouvez pas construire votre propre maison. -

- -
- - diff --git a/navigateur.php b/navigateur.php deleted file mode 100755 index 59f7f01..0000000 --- a/navigateur.php +++ /dev/null @@ -1,84 +0,0 @@ - - - -

Informations de votre navigateur Web

- - -

-

Votre adresse IP

- - Votre adresse IP est : -

- Une adresse IP (IP pour Internet Protocol) est une information permettant d'identifier un ordinateur. Elle est utilisée pour n'importe quel échange sur internet. -

- - - - -

-

Votre référent HTTP

- - - - - Votre navigateur n'a pas envoyé de référent HTTP (HTTP referer). - - - Votre référent HTTP (HTTP referer) est : - -

- Un référent HTTP est une information envoyée par votre navigateur indiquant au site sur quelle page vous vous trouviez avant d'utiliser le lien qui vous a conduit ici. - -
- -

- - - - - -

-

Votre agent utilisateur

- L'agent utilisateur (user agent) envoyé par votre navigateur est : -

- Un agent utilisateur est une information envoyée par votre navigateur indiquant au site diverses informations sur vous. Il peut contenir votre système d'exploitation, votre navigateur, sa version et votre langue. -

- - - - -

-

Langues demandées

- Votre navigateur a demandé la ou les langue·s suivante·s : -

- Votre navigateur envoie aux pages qu'il visite la liste des langues que vous êtes censé·e pouvoir lire (généralement en se basant sur la langue de son interface). - - -

- - - - "; - echo htmlspecialchars($_SERVER['HTTP_USER_AGENT']); - -} else { - echo "Erreur : Mauvais argument·s"; -} diff --git a/pages/404.md b/pages/404.md new file mode 100644 index 0000000..f2af9c3 --- /dev/null +++ b/pages/404.md @@ -0,0 +1,6 @@ + +![Erreur 404](img/404fourmie.png){#img404} + +La page à laquelle vous avez tenté d'accéder a été Antièrement dévorée par une armée de fourmis affamées ! + +[Page d'accueil](.){.bouton} diff --git a/pages/autres-initiatives.md b/pages/autres-initiatives.md new file mode 100644 index 0000000..cddba4f --- /dev/null +++ b/pages/autres-initiatives.md @@ -0,0 +1,12 @@ +Cette page liste d'autres initiative de décentraliser et décommercialiser Internet. + +Snopyta +DryCat +riseup.net +NixNet +Disroot +ACAB.IO +42l +TeDomum +Infini +Hostux diff --git a/pages/cgu.md b/pages/cgu.md new file mode 100644 index 0000000..8a42034 --- /dev/null +++ b/pages/cgu.md @@ -0,0 +1,28 @@ +## Préambule + +L'utilisation des services Antopie vous lie aux conditions suivantes. +Antopie se réserve le droit de mettre à jour et modifier ces conditions à tout moment. +Ces conditions sont dérivées de [celles de Framasoft](https://framasoft.org/fr/cgu/). + +## Conditions des services + +* Vous êtes responsable de la sécurité de votre compte et de votre mot de passe. +* Vous êtes responsable de tout contenu affiché et de l’activité qui se produit sous votre compte. +* Vous ne pouvez pas vendre, échanger ou exploiter dans un but commercial un compte du service utilisé. +* L’échec d'Antopie à exercer ou à appliquer tout droit ou disposition des Conditions d’utilisation ne constitue pas une renonciation à ce droit ou à cette disposition. +* Les conditions d'utilisation actuelles remplacent les anciennes versions. +* Vous ne devez pas tenter de nuire aux services Antopie ou à celleux les utilisant. +* Les services étant hébergés en France par une personne de nationnalité française, vous devez respecter au moins la législation en vigueur en France. +* Savoir orthographier correctement le mot « spatule » n'est pas nécessaire pour utiliser les services Antopie. + +## Garantie + +* Antopie se dégage de toutes responsabilités dans la limite de la loi. +* Antopie se réserve le droit, à tout moment de modifier ou d’interrompre, temporairement ou définitivement, le service avec ou sans préavis. + +## Données personnelles + +* Conformément à l’article 34 de la loi « Informatique et Libertés », Antopie garantit à l’utilisateurice un droit d’opposition, d’accès et de rectification sur les données nominatives læ concernant. L'utilisateurice a la possibilité d’exercer ce droit en envoyant un [email](mailto:miraty+legal@antopie.org) à l'admin. +* Malgré ce que certaines interfaces pourraient laisser penser, il n'est jamais nécessaire de révéler votre identité pour utiliser les services. +* Tout comme d’autres services en ligne, Antopie enregistre automatiquement certaines informations concernant votre utilisation du service (exemple : type de navigateur, adresse IP, date et heure de l’accès, URL de référence). +Ces données ne sont ni vendues, ni transmises à des tiers, dans la limite de la loi. diff --git a/pages/contact.md b/pages/contact.md new file mode 100644 index 0000000..4d6d6a9 --- /dev/null +++ b/pages/contact.md @@ -0,0 +1,5 @@ +Vous pouvez me contacter par l'un des moyens suivants : +* Mail : [miraty+antopie@antopie.org](mailto:miraty+antopie@antopie.org) + OpenPGP : [`B16B 12A8 957B 2EC7 9659 04A6 B82D 15F0 3E67 B2B5`](/B16B12A8957B2EC7965904A6B82D15F03E67B2B5.asc) +* Matrix : @miraty:matrix.antopie.org +* Fédiverse : [@miraty@plero.antopie.org](https://plero.antopie.org/miraty) diff --git a/pages/courriel.md b/pages/courriel.md new file mode 100644 index 0000000..f9bb979 --- /dev/null +++ b/pages/courriel.md @@ -0,0 +1,55 @@ +Cette page de concerne que les personnes pour lesquelles j'ai manuellement créé un compte interne. Ce service n'est pas ouvert au public. + +## Webmail Roundcube + +[https://mail.antopie.org](https://mail.antopie.org) +Connectez vous avec vos identifiants YunoHost. +Lors de votre première connexion, Roundcube vous demandera votre adresse mail. +Changez `pseudo@localhost` en `pseudo@antopie.org` puis validez. + +## Sur son PC, avec Thunderbird + +### Installer Thunderbird + +#### Linux + +Le paquet `thunderbird` devrait être disponible. Si l'interface est en anglais, installer aussi le paquet de langue (`thunderbird-locale-fr` sous Debian/Ubuntu) + +#### Partout + +Télécharger sur [le site officiel](https://www.thunderbird.net). + +### Configurer Thunderbird + +Lors du premier démarrage, Thunderbird demande automatiquement à configurer un nouveau compte. Si vous avez déjà une installation de Thunderbird avec un autre compte mail, faites clic droit sur l'adresse du compte, paramètres, gestion des comptes, ajouter un compte de messagerie. + +Renseignez les 3 premiers champs (le mot de passe est le même que celui pour accéder à [https://yuno.antopie.org](https://yuno.antopie.org)), puis cliquer sur "Configuration avancée". +Ensuite remplir les champs comme dans l'image ci-dessous : + +![config-thunderbird.png](img/docs/config-thunderbird.png) + +Puis cliquer sur "Terminé". + +## Sur Android, avec K9-Material + +### Installer F-Droid + +F-Droid est un dépôt de logiciels libres et une application pour Android. En l'installant, elle vous permettra de facilement installer et mettre à jour des logiciels libres sur votre système Android. + +Si ce n'est pas déjà fait, téléchargez l'APK d'F-Droid depuis [le site officiel](https://f-droid.org/), puis le lancer. Android demandera peut-être à autoriser votre navigateur à installer des applications, faites-le. + +Ne désinstallez pas F-Droid, sinon toutes les applications que vous avez installées avec ne seront plus mises à jour ! + +### Installer K9 Material + +K9 Material est un client mail pour Android, qui fourni une interface plus jolie à K9. + +Pour l'installer, rechercher son nom dans F-Droid puis cliquer sur le bouton Télécharger ou Installer. + +Ouvrir l'application et cliquer sur ajouter un nouveau compte, renseigner son adresse mail et son mot de passe, puis valider. Remplir ensuite les champs comme ils sont remplis ci-dessous. + +![k9-imap-300.png](img/docs/k9-imap-300.png) ![k9-smtp-300.png](img/docs/k9-smtp-300.png) + +Choisissez la fréquence de récupération du dossier (tous les combiens de temps K9 devra vérifier si vous avez reçu de nouveau messages ? ; choisir "Toutes les minutes" consommera plus de batterie). + +Ce tutoriel a été aidé par [la documentation de YunoHost](https://yunohost.org/#/email_configure_client_fr). diff --git a/pages/details-techniques.md b/pages/details-techniques.md new file mode 100644 index 0000000..d866360 --- /dev/null +++ b/pages/details-techniques.md @@ -0,0 +1,38 @@ +*[FTTH]: Fiber To The Home +*[FAI]: Fournisseur d'Accès à Internet +*[DNSSEC]: Domain Name System Security Extensions +*[HSTS]: HTTP Strict Transport Security + +## Matériel + +Une tour nommée Pastèque avec : +* 12 Go de RAM +* Disque dur d'1,5 To +* Intel Core i5 64 bits 4 cœurs 3.4GHz + +## Système + +[YunoHost](https://yunohost.org) 3.8 (basé sur [Debian](https://www.debian.org) 9) et son écosystème : Nginx, Postfix, Fail2ban... + +## DNS + +Le domaine `antopie.org` est enregistré chez [Gandi](https://gandi.net) et administré sur leur interface Web LiveDNS. +[DNSSEC](https://fr.wikipedia.org/wiki/Domain_Name_System_Security_Extensions) est activé dessus. +Il est enregistré dans la [HSTS Preload List](https://hstspreload.org). + +## Internet + +Pastèque est connectée à Internet via une connexion du FAI Free en fibre optique (FTTH) à Paris. +Le débit maximal disponible varie entre 50 Mo/s (400 Mbit/s) et 100 Mo/s (800 Mbit/s). +Adresse IPv6 : `2a01:e34:ec23:b760:5604:a6ff:fec4:58bd` +Adresse IPv4 : `78.194.59.118` + +## Sauvegarde + +Des sauvegardes sont faites régulièrement avec le [système intégré à YunoHost](https://yunohost.org/#/backup). +PeerTube et Nextcloud ne sont pas sauvegardées car cela prendrait trop de place. +Les sauvegardes sont copiées sur un disque dans la même pièce. + +## Relai Tor + +Pastèque héberge aussi [un relai Tor](https://metrics.torproject.org/rs.html#details/BE8737597F2E6B4F805893202C935125829A902E). diff --git a/pages/index.md b/pages/index.md new file mode 100644 index 0000000..81250ee --- /dev/null +++ b/pages/index.md @@ -0,0 +1,206 @@ +*[RSS]: Really Simple Syndication +*[v3]: version 3 + +Antopie propose des services Internet, administrés par et hébergés chez [Miraty]() grâce à [YunoHost](https://yunohost.org). + +Le compte @Antopie@miaou.drycat.fr ([RSS](https://miaou.drycat.fr/@Antopie.rss)) informe des pannes, mises à jour et nouveaux services. + +[Manifeste sur le contenu]() {.bouton} [Détails techniques]() {.bouton} [Conditions d'utilisation]() {.bouton} + +
+ + 'plume.png', +'peertube' => 'peertube.png', +'gitea' => 'gitea.png', +'libreqr' => 'libreqr.png', +'bitwarden' => 'bitwarden.png', +'nextcloud' => 'nextcloud.png', +'synapse' => 'matrix.png', +'riot' => 'riot.png', +'privatebin' => 'privatebin.png', +'jirafeau' => 'jirafeau.png', +'rssbridge' => 'rssbridge.png', +'searx' => 'searx.png', +'etherpad' => 'etherpad.png', +'diagrams' => 'diagrams.png', +'opensondage' => 'opensondage.png', +'iprefua' => NULL, +); + +$urlService = array( +'plume' => clearnetOrOnion('https://blog.antopie.org', 'http://antblogn2vnc4hncjiow4jn7yidxe64l2o2qhj2tyla33jjhrrf5v2ad.onion'), +'peertube' => 'https://video.antopie.org', +'gitea' => clearnetOrOnion('https://code.antopie.org', 'http://antcode5h4tntfei362x7eydifyxdjskjisv5pezk2othlh7oho2zhyd.onion'), +'libreqr' => clearnetOrOnion('https://qr.antopie.org', 'http://libreqrh5gsyzaaexx4vwyp6k2sd5keg5svyj2gpbkhg7zzyjvswiiyd.onion'), +'bitwarden' => clearnetOrOnion('https://mdp.antopie.org', 'http://antmdpizuaquzfz5kzv3tz3k2funlcgma5gxtujxs5sl6z7wyk76x3qd.onion'), +'nextcloud' => 'https://nuage.antopie.org', +'synapse' => 'https://matrix.antopie.org', +'riot' => 'https://riot.antopie.org', +'privatebin' => clearnetOrOnion('https://texte.antopie.org', 'http://anttxt2u75lbrpl23szr6qtgzx5kkcz7larjmg24udwypceuslzel5qd.onion'), +'jirafeau' => clearnetOrOnion('https://up.antopie.org', 'http://antuplo4vcln7ftoatr5iualwb3py7ccii6t32gemzannhu4blj2xqid.onion'), +'rssbridge' => clearnetOrOnion('https://rss.antopie.org', 'http://antrssv5553pjemejxyszija6ceii4soc5ozk6pdj7y3vauzioavdkid.onion'), +'searx' => clearnetOrOnion('https://searx.antopie.org', 'http://antsrxhuvxylfgvu6c33m6gzlp3dsrxfnil7z3ppfya2vqvs4hkuy7qd.onion'), +'etherpad' => 'https://pad.antopie.org', +'diagrams' => 'https://draw.antopie.org', +'opensondage' => clearnetOrOnion('https://sondage.antopie.org', 'http://antaskuzziqjodxfighsptanvhrwmb7h5nsgjwei2dvvtsuqgjsaxvad.onion'), +'iprefua' => 'https://ip.antopie.org', +); + +$nomService = array( +'plume' => 'Plume', +'peertube' => 'PeerTube', +'gitea' => 'Gitea', +'libreqr' => 'LibreQR', +'bitwarden' => 'Bitwarden', +'nextcloud' => 'Nextcloud', +'synapse' => 'Synapse', +'riot' => 'Riot', +'privatebin' => 'PrivateBin', +'jirafeau' => 'Jirafeau', +'rssbridge' => 'RSS Bridge', +'searx' => 'Searx', +'etherpad' => 'Etherpad', +'diagrams' => 'Diagrammes', +'opensondage' => 'OpenSondage', +'iprefua' => 'Iprefua', +); + +$descService = array( +'plume' => 'Créez simplement un blog qui sera accessible via le Web, le Fédiverse et un flux Atom.', +'peertube' => 'Regardez ou publiez des vidéos sur le Fédiverse en pair à pair.', +'gitea' => 'Forge logicielle simple basée sur Git.', +'libreqr' => 'Un générateur de codes QR fait maison.', +'bitwarden' => 'Générez, enregistrez et synchronisez des mots ou phrases de passe fortes.', +'nextcloud' => 'Synchronisation de fichiers, de contacts (CardDAV), d’agenda (CalDAV), Carnet , et plein d’autres fonctionnalités grâce à des extensions.', +'synapse' => 'Un serveur Matrix, qui est un protocole internet moderne pour la communication écrite, audio ou vidéo.
matrix.antopie.org
', +'riot' => 'Client Web pour Matrix.', +'privatebin' => 'Partagez des textes, codes sources ou Markdown rapidement.', +'jirafeau' => 'Partagez rapidement n’importe quel fichier avec n’importe qui.', +'rssbridge' => 'Exportez les données de centaines de sites aux formats Atom, JSON, HTML, Mrss ou texte.', +'searx' => 'Métamoteur anonymé : combine plusieurs moteurs de recherche sur une seule page.', +'etherpad' => 'Éditez un texte sur plusieurs appareils en même temps. Utilisable avec MyPads.', +'diagrams' => 'Créez des diagrammes.', +'opensondage' => 'Planifiez un rendez-vous ou prenez des décisions.', +'iprefua' => 'Afficher adresse IP, agent utilisateur, référent HTTP et langues demandées.', +); + +$siteOfficielService = array( +'plume' => 'joinplu.me', +'peertube' => 'joinpeertube.org', +'gitea' => 'gitea.io', +'libreqr' => NULL, +'bitwarden' => 'bitwarden.com', +'nextcloud' => 'nextcloud.com/fr_FR', +'synapse' => NULL, +'riot' => 'about.riot.im', +'privatebin' => 'privatebin.info', +'jirafeau' => NULL, +'rssbridge' => NULL, +'searx' => 'asciimoo.github.io/searx', +'etherpad' => 'etherpad.org', +'diagrams' => 'www.diagrams.net', +'opensondage' => NULL, +'iprefua' => NULL, +); + +$gitService = array( +'plume' => 'git.joinplu.me/plume/plume', +'peertube' => 'github.com/Chocobozzz/PeerTube', +'gitea' => 'github.com/go-gitea/gitea', +'libreqr' => 'code.antopie.org/miraty/libreqr', +'bitwarden' => 'github.com/dani-garcia/bitwarden_rs', +'nextcloud' => 'github.com/nextcloud/server', +'synapse' => 'github.com/matrix-org/synapse', +'riot' => 'github.com/vector-im/riot-web', +'privatebin' => 'github.com/PrivateBin/PrivateBin', +'jirafeau' => 'gitlab.com/mojo42/Jirafeau', +'rssbridge' => 'github.com/rss-bridge/rss-bridge', +'searx' => 'github.com/asciimoo/searx', +'etherpad' => 'github.com/ether/etherpad-lite', +'diagrams' => 'github.com/jgraph/drawio', +'opensondage' => 'framagit.org/framasoft/framadate/framadate', +'iprefua' => 'code.antopie.org/miraty/iprefua', +); + +$paquetYnhService = array( +'plume' => 'github.com/YunoHost-Apps/plume_ynh', +'peertube' => 'github.com/YunoHost-Apps/peertube_ynh', +'gitea' => 'github.com/YunoHost-Apps/gitea_ynh', +'libreqr' => 'code.antopie.org/miraty/qr_ynh', +'bitwarden' => 'github.com/YunoHost-Apps/bitwarden_ynh', +'nextcloud' => 'github.com/YunoHost-Apps/nextcloud_ynh', +'synapse' => 'github.com/YunoHost-Apps/synapse_ynh', +'riot' => 'github.com/YunoHost-Apps/riot_ynh', +'privatebin' => 'github.com/YunoHost-Apps/zerobin_ynh', +'jirafeau' => 'github.com/YunoHost-Apps/jirafeau_ynh', +'rssbridge' => 'github.com/YunoHost-Apps/rss-bridge_ynh', +'searx' => 'github.com/YunoHost-Apps/searx_ynh', +'etherpad' => 'github.com/YunoHost-Apps/etherpad_mypads_ynh', +'diagrams' => 'github.com/YunoHost-Apps/diagramsnet_ynh', +'opensondage' => 'github.com/YunoHost-Apps/opensondage_ynh', +'iprefua' => 'github.com/YunoHost-Apps/multi_webapp_ynh', +); + +$actionService = array( +'plume' => 'Bloguer', +'peertube' => 'Accéder au service', +'gitea' => 'Coder', +'libreqr' => 'Accéder au service', +'bitwarden' => 'Accéder au service', +'nextcloud' => 'Accéder au service', +'synapse' => "Plus d'infos", +'riot' => 'Clavarder', +'privatebin' => 'Téléverser du texte', +'jirafeau' => 'Téléverser un fichier', +'rssbridge' => 'Bridger', +'searx' => 'Rechercher', +'etherpad' => 'Créer un nouveau pad', +'diagrams' => 'Accéder au service', +'opensondage' => 'Créer un sondage', +'iprefua' => 'Accéder au service', +); + +$aboutService = array( +'plume' => NULL, +'peertube' => NULL, +'gitea' => NULL, +'libreqr' => NULL, +'bitwarden' => NULL, +'nextcloud' => 'nextcloud', +'synapse' => NULL, +'riot' => NULL, +'privatebin' => NULL, +'jirafeau' => NULL, +'rssbridge' => NULL, +'searx' => NULL, +'etherpad' => NULL, +'diagrams' => NULL, +'opensondage' => NULL, +'iprefua' => NULL, +); + +foreach($descService as $codeService => $descService) { ?> +
+ +
+
+
+'; +} ?> + +
+ + +
+ +
+ +
+ + + +
diff --git a/pages/manifeste-sur-le-contenu.md b/pages/manifeste-sur-le-contenu.md new file mode 100644 index 0000000..cbc4ec2 --- /dev/null +++ b/pages/manifeste-sur-le-contenu.md @@ -0,0 +1,20 @@ +Ce manifeste s'applique aux cas où les services Antopie sont utilisés pour diffuser publiquement du contenu. L'utilisation des services dans un cadre privé n'est pas concernée par ce manifeste. + +Antopie refuse d'héberger du contenu soutenant une vision du monde droitiste, y compris : +* Fascisme, racisme, capacitisme, essentialisme +* Capitalisme, publicité +* Sexisme, homophobie, transphobie +* Théisme, conspirationnisme, spiritualisme + +Antopie encourage la diffusion d'idées gauchistes, y compris : +* Librisme, datalove, kopimisme +* Anarchisme, communisme, socialisme +* Féminisme, queer +* Écologisme, véganisme, décroissance +* Éducation populaire, pensée critique + +**Les contenus qui n'ont pas particulièrement d'impact politique sont également les bienvenus.** + +Ces règles sont édictées pour que vous puissiez vous faire une idée de la modération et du but d'Antopie. Il ne s'agit pas d'une vérité absolue. Je garde ma liberté de ne pas modérer ou de modérer pour d'autres raisons. + +**Ce n'est pas une atteinte à la liberté d'expression.** Ce manifeste ne vous interdit pas de vous exprimer. Il vous demande simplement de ne pas le faire par un service Antopie si vous avez des idées trop différentes, auquel cas vous pourrez trouvez un service qui vous convient mieux. diff --git a/pages/matrix.md b/pages/matrix.md new file mode 100644 index 0000000..2e198f0 --- /dev/null +++ b/pages/matrix.md @@ -0,0 +1,55 @@ + +Matrix est un protocole de communication permettant les communications instantanées sur Internet. + +Antopie propose un serveur Matrix à l'adresse `matrix.antopie.org` et le client Web Riot à l'adresse [https://riot.antopie.org](https://riot.antopie.org). +Ce tutoriel se propose de vous apprendre à utiliser ces services. + +## Client / serveur + +Tout comme les courriels, Matrix fonctionne sur le modèle client/serveur. + +Le serveur est un logiciel qui tourne sur un ordinateur laissé allumé en permanence. + +Le client, c'est votre appareil qui se connecte au serveur pour vérifier si il a reçu de nouveaux messages ou pour en envoyer. + +## La pratique + +Rendez-vous sur [https://riot.antopie.org/#/register](https://riot.antopie.org/#/register). +Renseignez votre pseudo ou nom et définissez un nouveau mot de passe, puis validez. Vous pouvez aussi spécifier une adresse mail pour changer de mot de passe si vous l'avez oublié. +Vous arriverez sur l'interface de Riot, et rejoindrez automatiquement le salon de discussion publique `#antopie:matrix.antopie.org`. + +Si vous souhaitez que d'autres personnes vous contactent, votre identifiant Matrix est `@pseudo:matrix.antopie.org`. + +Pour commencer une autre discussion, cliquez sur le plus à côté de la section messages directs, à gauche, et cherchez l'identifiant Matrix. + +Mon identifiant Matrix est `@miraty:matrix.antopie.org`. + +## Les clients + +### Linux + +#### [Riot](https://riot.im/download/desktop/) + +#### Fractal + +#### Nhecko + +#### Quaternion + +### Windows et MacOS + +#### [Riot](https://riot.im/download/desktop/) + +### Android + +#### Riot + +[Sur F-Droid](https://f-droid.org/fr/packages/im.vector.alpha/) et le Google Play Store + +#### RiotX + +Une version destinée à terme à remplacer la version actuelle de Riot. + +### iOS + +Il y a aussi une version de Riot sur l'App Store d'iOS diff --git a/pages/nextcloud.md b/pages/nextcloud.md new file mode 100644 index 0000000..ad48f08 --- /dev/null +++ b/pages/nextcloud.md @@ -0,0 +1,60 @@ +*[SMTP]: Simple Mail Transfer Protocol +*[IMAP]: Internet Message Access Protocol +*[Gio]: gibioctet + +Antopie propose une instance Nextcloud sur [https://nuage.antopie.org](https://nuage.antopie.org). +L'instance utilise un thème sombre, basé sur breeze dark de KDE. + +![L'interface de Nextcloud](img/docs/nextcloud-files-zoom.png) {.imgArticle} + +La limite de stockage par défaut est de 20 Gio. +Les données de Nextcloud ne sont pas sauvegardées ; n'en gardez pas d'importantes uniquement dessus. + +## Créer un compte + +Pour commencer à utiliser l'instance Nextcloud d'Antopie : + +1. Accéder à [https://nuage.antopie.org/apps/registration](https://nuage.antopie.org/apps/registration). +2. Indiquer son adresse courriel +3. Cliquer sur le lien envoyé par courriel +4. Indiquer son pseudo/nom et un mot de passe +5. Accepter les [conditions d'utilisation]() + +## Applications disponibles + +Les applications listées ici sont celle qui semblent les plus stables ou officielles, ou qui ont été plus testées. D'autres sont disponibles mais utilisez-les avec plus de précautions. + +Fichiers +: Sauvegarder et synchroniser des fichiers + Fonctionnalité principale de Nextcloud + [Télécharger les clients](https://nextcloud.com/install/#install-clients) + +Carnet +: Prise de notes + Peut se syncroniser avec les autres clients Carnet + [Télécharger les clients](https://getcarnet.app/) + +Mail +: Webmail + Permet d'ajouter n'importe quel compte IMAP/SMTP + +Contacts +: Gestion de contacts + Syncronisation CardDAV possible + +Agenda +: Gestion d'agendas + Syncronisation CalDAV possible + +Nextcloud Notes +: Prise de notes + +Sondage +: Équivalent Nextcloud à [OpenSondage]() + +Favoris +: Gestion de marques-pages + Peut se syncroniser avec les marques-pages du navigateur Web via [Floccus](https://addons.mozilla.org/firefox/addon/floccus) + +Talk +: Permet de chatter et de faire des appels audio/vidéo diff --git a/services.php b/services.php deleted file mode 100644 index e5a63c1..0000000 --- a/services.php +++ /dev/null @@ -1,180 +0,0 @@ - - - - -
- - 'plume.png', - 'peertube' => 'peertube.png', - 'gitea' => 'gitea.png', - 'libreqr' => 'qr.png', - 'bitwarden' => 'bitwarden.png', - 'nextcloud' => 'nextcloud.png', - 'synapse' => 'matrix.png', - 'riot' => 'riot.png', - 'privatebin' => 'privatebin.png', - 'jirafeau' => 'jirafeau.png', - 'rssbridge' => 'rssbridge.png', - 'searx' => 'searx.png', - 'etherpad' => 'etherpad.png', - 'diagrams' => 'diagrams.png', - 'opensondage' => 'opensondage.png', -); - -$urlService = array( - 'plume' => 'blog', - 'peertube' => 'video', - 'gitea' => 'code', - 'libreqr' => 'qr', - 'bitwarden' => 'mdp', - 'nextcloud' => 'nuage', - 'synapse' => 'matrix', - 'riot' => 'riot', - 'privatebin' => 'texte', - 'jirafeau' => 'up', - 'rssbridge' => 'rss', - 'searx' => 'searx', - 'etherpad' => 'pad', - 'diagrams' => 'draw', - 'opensondage' => 'sondage', -); - -$nomService = array( - 'plume' => 'Plume', - 'peertube' => 'PeerTube', - 'gitea' => 'Gitea', - 'libreqr' => 'LibreQR', - 'bitwarden' => 'Bitwarden', - 'nextcloud' => 'Nextcloud', - 'synapse' => 'Synapse', - 'riot' => 'Riot', - 'privatebin' => 'PrivateBin', - 'jirafeau' => 'Jirafeau', - 'rssbridge' => 'RSS Bridge', - 'searx' => 'Searx', - 'etherpad' => 'Etherpad', - 'diagrams' => 'Diagrammes', - 'opensondage' => 'OpenSondage', -); - -$infoThemeService = array( - 'plume' => 'Thème sombre & rouge', - 'peertube' => 'Thème rouge', - 'gitea' => 'Thème sombre', - 'libreqr' => 'Thème sombre', - 'bitwarden' => NULL, - 'nextcloud' => 'Thème sombre', - 'synapse' => NULL, - 'riot' => NULL, - 'privatebin' => 'Thème sombre', - 'jirafeau' => 'Thème sombre', - 'rssbridge' => 'Thème sombre & rouge', - 'searx' => 'Thème sombre', - 'etherpad' => NULL, - 'diagrams' => NULL, - 'opensondage' => NULL, -); - -$descService = array( - 'plume' => 'Créez simplement un blog qui sera accessible via le Web, le Fédiverse et un flux Atom.', - 'peertube' => 'Regardez ou publiez des vidéos sur le Fédiverse en pair à pair.', - 'gitea' => 'Forge logicielle simple basée sur Git.', - 'libreqr' => "Un générateur de codes QR fait maison.", - 'bitwarden' => 'Générez, enregistrez et synchronisez des mots ou phrases de passe fortes.', - 'nextcloud' => 'Synchronisation de fichiers, de contacts (CardDAV), d’agenda (CalDAV), Carnet , et plein d’autres fonctionnalités grâce à des extensions.', - 'synapse' => 'Un serveur Matrix, qui est un protocole internet moderne pour la communication écrite, audio ou vidéo.', - 'riot' => 'Client Web pour Matrix.', - 'privatebin' => 'Partagez des textes, codes sources ou Markdown rapidement.', - 'jirafeau' => 'Partagez rapidement n’importe quel fichier avec n’importe qui.', - 'rssbridge' => 'Exportez les données de centaines de sites aux formats Atom, JSON, HTML, Mrss ou texte.', - 'searx' => 'Métamoteur anonymé : combine plusieurs moteurs de recherche sur une seule page.', - 'etherpad' => 'Éditez un texte sur plusieurs appareils en même temps. Utilisable avec MyPads.', - 'diagrams' => 'Créez des graphiques pour représenter des idées.', - 'opensondage' => 'Planifiez un rendez-vous ou prenez des décisions rapidement et simplement.' -); - -$siteOfficielService = array( - 'plume' => 'joinplu.me', - 'peertube' => 'joinpeertube.org', - 'gitea' => 'gitea.io', - 'libreqr' => NULL, - 'bitwarden' => 'bitwarden.com', - 'nextcloud' => 'nextcloud.com/fr_FR', - 'synapse' => NULL, - 'riot' => 'about.riot.im', - 'privatebin' => 'privatebin.info', - 'jirafeau' => NULL, - 'rssbridge' => NULL, - 'searx' => 'asciimoo.github.io/searx', - 'etherpad' => 'etherpad.org', - 'diagrams' => 'www.diagrams.net', - 'opensondage' => NULL, -); - -$gitService = array( - 'plume' => 'github.com/Plume-org/Plume', - 'peertube' => 'github.com/Chocobozzz/PeerTube', - 'gitea' => 'github.com/go-gitea/gitea', - 'libreqr' => 'code.antopie.org/miraty/libreqr', - 'bitwarden' => 'github.com/dani-garcia/bitwarden_rs', - 'nextcloud' => 'github.com/nextcloud/server', - 'synapse' => 'github.com/matrix-org/synapse', - 'riot' => 'github.com/vector-im/riot-web', - 'privatebin' => 'github.com/PrivateBin/PrivateBin', - 'jirafeau' => 'gitlab.com/mojo42/Jirafeau', - 'rssbridge' => 'github.com/rss-bridge/rss-bridge', - 'searx' => 'github.com/asciimoo/searx', - 'etherpad' => 'github.com/ether/etherpad-lite', - 'diagrams' => 'github.com/jgraph/drawio', - 'opensondage' => 'framagit.org/framasoft/framadate/framadate' -); - -$paquetYnhService = array( - 'plume' => 'github.com/YunoHost-Apps/plume_ynh', - 'peertube' => 'github.com/YunoHost-Apps/peertube_ynh', - 'gitea' => 'github.com/YunoHost-Apps/gitea_ynh', - 'libreqr' => 'code.antopie.org/miraty/qr_ynh', - 'bitwarden' => 'github.com/YunoHost-Apps/bitwarden_ynh', - 'nextcloud' => 'github.com/YunoHost-Apps/nextcloud_ynh', - 'synapse' => 'github.com/YunoHost-Apps/synapse_ynh', - 'riot' => 'github.com/YunoHost-Apps/riot_ynh', - 'privatebin' => 'github.com/YunoHost-Apps/zerobin_ynh', - 'jirafeau' => 'github.com/YunoHost-Apps/jirafeau_ynh', - 'rssbridge' => 'github.com/YunoHost-Apps/rss-bridge_ynh', - 'searx' => 'github.com/YunoHost-Apps/searx_ynh', - 'etherpad' => 'github.com/YunoHost-Apps/etherpad_mypads_ynh', - 'diagrams' => 'github.com/YunoHost-Apps/diagramsnet_ynh', - 'opensondage' => 'github.com/YunoHost-Apps/opensondage_ynh', -); - - foreach($descService as $codeService => $descService) { ?> -
- -
-
· ·
-
- '; - } ?> - -
-
- - - -
- - - - - diff --git a/style.less b/style.less index e6154b9..1be214d 100755 --- a/style.less +++ b/style.less @@ -1,14 +1,12 @@ @fond: #2a2a2a; @fondSecondaire: #222222; @fondOptionHover: lighten(@fond, 10%); -@texteSecondaire: #aaaaaa; @texte: white; -@couleurL: white; +@couleurLien: white; @couleurPrincipale: red; - -.texte-secondaire { - color: @texteSecondaire; -} +@border: #5f5f5f; +@borderHover: #808080; +@borderFocus: white; ::selection { color: @fond; @@ -33,23 +31,35 @@ } +.petit-bouton { + border: 2px solid grey; + padding: 2px; + padding-left: 10px; + padding-right: 10px; + margin: 5px; + font-size: 80%; + display: inline-block; + border-radius: 14px; + color: @texte; + text-decoration: none; + + &:hover { + color: @couleurPrincipale; + border: 2px solid @couleurPrincipale; + } + +} + html { font-size: 20px; scrollbar-color: @texte @fond; scrollbar-width: auto; } -@media all and (max-width: 640px) { - - html { - font-size: 13px; - } - -} a, a:visited { text-decoration: underline; - color: @couleurL; + color: @couleurLien; transition: all 0.1s linear; &:hover { @@ -63,17 +73,18 @@ a, a:visited { margin-bottom: 10px; } -#img404 { - padding-top: 10px; - padding-bottom: 30px; - width: 30%; - @media (max-width: 1300px) { - width: 766px; - } +img { + height: auto; + max-width: 100%; } -#page404 { - text-align: center; +.imgArticle { + border: 1px white solid; + border-radius: 5px; + display: block; + margin: auto; + margin-top: 20px; + margin-bottom: 20px; } del { @@ -92,7 +103,7 @@ body { font-family: "Ubuntu", sans-serif; padding: 0px; margin: 0px; - background-color: @fond; + background-color: @fondSecondaire; color: @texte; font-size: 25px; line-height: 35px; @@ -102,11 +113,30 @@ address { font-style: normal; } +ul { + padding-left: 35px; + margin: 0px; +} + +dt { + font-weight: 500; +} + +dd { + margin-left: 25px; + padding-bottom: 10px; +} + +p { + margin: 0px; + padding-top: 10px; + padding-bottom: 10px; +} + .grille-services { display: grid; grid-template-columns: 1fr 1fr 1fr 1fr; grid-gap: 30px; - padding-top: 30px; @media (max-width: 1500px) { grid-template-columns: 1fr 1fr 1fr; @@ -128,28 +158,6 @@ address { justify-content: center; } -.lienService, .lienService:visited { - padding: 20px; - border: 2px @fond solid; - border-radius: 16px; - transition: border 0.2s linear; - color: @texte; - text-decoration: none; - display: block; - padding-bottom: 10px; - margin-bottom: 10px; - max-width: 210px; - &:hover { - border: 2px white solid; - color: @texte; - } -} - -.themeService { - text-align: center; - font-size: 0.8em; -} - .titreService { font-size: 1.3em; text-align: center; @@ -164,7 +172,8 @@ address { .metaService { text-decoration: none; - font-size: 26px; + font-size: 28px; + margin-top: 6px; } .metasService { @@ -191,11 +200,15 @@ address { } main { + background-color: @fond; margin: 0px; - margin-top: 30px; - margin-left: 30px; - margin-bottom: 50px; - margin-right: 30px; + padding: 30px; + padding-top: 15px; + + @media (max-width: 500px) { + padding-left: 10px; + padding-right: 10px; + } } .centre { @@ -203,7 +216,6 @@ main { justify-content: center; } - article { margin-left: 20%; margin-right: 20%; @@ -234,11 +246,9 @@ article { // FOOTER .textefooter { - margin: 10px; + margin: 30px; line-height: 1.5em; - width: 60%; - padding-left: 20px; - padding-right: 20px; + text-align: center; } .interlude { @@ -252,23 +262,11 @@ article { .traitinterlude { border-top: 2px gray dashed; - width: 650px; -} - -.basfooter { - display: flex; - justify-content: space-around; - margin-top: 30px; - margin-bottom: 20px; -} - -.corps { - text-align: center; + width: 250px; } footer { text-align: center; - background-color: @fondSecondaire; display: flex; flex-direction: column; } @@ -279,21 +277,6 @@ footer { text-align: center; } -.ant { - background-color: @fondSecondaire; - background-image: url(img/antpetitgris.png); - background-repeat: no-repeat; - background-position: center top; - display: inline-block; - text-decoration: none; - min-width: 264px; - min-height: 80px; -} - -.ant:hover { - background-image: url(img/antpetit.png); -} - .liensfooter { display: flex; flex-direction: row; @@ -332,7 +315,6 @@ footer { header { display: flex; justify-content: center; - background-color: @fondSecondaire; } @@ -360,47 +342,35 @@ h1, h2, h3, h4, h5, h6 { h1 { font-size: 250%; text-align: center; + margin: 0px; + padding-bottom: 20px; + padding-top: 15px; } h2 { - font-size: 170%; + font-size: 200%; + margin-top: 50px; + margin-bottom: 20px; } h3 { font-size: 160%; + margin-top: 30px; + margin-bottom: 10px; } h4 { - font-size: 140%; + font-size: 130%; + margin-top: 0px; + margin-bottom: 0px; } h5 { - font-size: 125%; + font-size: 115%; } h6 { - font-size: 110%; -} - -#LRI { - color: pink !important; - aime: "les pizza ananas-champignons"; - width: 200px; - position: absolute; - top: 10px; - left: 10px; - @media (max-width: 1300px) { - width: 60px; - position: absolute; - top: 2px; - left: 2px; - } - @media (max-width: 1000px) { - width: 32px; - position: absolute; - top: 2px; - left: 2px; - } + font-size: 107%; } .gomeza { @@ -411,35 +381,59 @@ h6 { z-index: 100; } +// --- Formulaire --- +/* +input, textarea { + border: 2px @border solid; + border-radius: 10px; + font-size: 20px; + font-weight: normal; + color: @texte; + transition: border 0.1s linear; + background-color: @fondSecondaire; + margin-top: 8px; + font-family: "Ubuntu", sans-serif; + padding: 10px; + margin: 10px; + + &:hover { + border: 2px @borderHover solid; + } + + &:focus { + border: 2px @borderFocus solid; + outline: none; + } +} + +input[type="text"] { + width: 100px; +} + +textarea { + background-color: @fondSecondaire; + color: @texte; + scrollbar-color: @texte @fond; + scrollbar-width: auto; + width: 90%; +} + +textarea::placeholder { + color: @texteSecondaire; + opacity: 1; + font-family: "Ubuntu", sans-serif; + font-weight: normal; + font-size: 1em; +} +*/ @media (max-width: 800px) { .basfooter { flex-direction: column; } - .textefooter { - width: auto; - margin: 4%; - margin-bottom: 0px; - } - .logofooter { padding: 0px; } - .traitinterlude { - width: 80%; - } -} - -@media (max-width: 500px) { - .textefooter { - padding-left: 8%; - padding-right: 8%; - margin: 0px; - } - - .liensfooter { - flex-direction: column; - } }