www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/graphics graphics.ja.html po/graphics.ja-di...


From: GNUN
Subject: www/graphics graphics.ja.html po/graphics.ja-di...
Date: Tue, 22 Nov 2022 07:00:52 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     22/11/22 07:00:51

Modified files:
        graphics       : graphics.ja.html 
        graphics/po    : graphics.ja-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/graphics.ja.html?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/graphics.ja-diff.html?cvsroot=www&r1=1.35&r2=1.36

Patches:
Index: graphics.ja.html
===================================================================
RCS file: /web/www/www/graphics/graphics.ja.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- graphics.ja.html    31 Aug 2022 05:38:48 -0000      1.51
+++ graphics.ja.html    22 Nov 2022 12:00:49 -0000      1.52
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/graphics/graphics.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/graphics/po/graphics.ja.po">
+ https://www.gnu.org/graphics/po/graphics.ja.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/graphics/graphics.html"
+ --><!--#set var="DIFF_FILE" value="/graphics/po/graphics.ja-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2022-09-23" --><!--#set 
var="ENGLISH_PAGE" value="/graphics/graphics.en.html" -->
 
 <!--#include virtual="/server/html5-header.ja.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -70,6 +75,7 @@
 
 <!--#include virtual="/graphics/po/graphics.translist" -->
 <!--#include virtual="/server/banner.ja.html" -->
+<!--#include virtual="/server/outdated.ja.html" -->
 <h2>GNUアートギャラリー</h2>
 <div class="thin"></div>
 
@@ -1451,7 +1457,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2022/08/31 05:38:48 $
+$Date: 2022/11/22 12:00:49 $
 
 <!-- timestamp end -->
 </p>

Index: po/graphics.ja-diff.html
===================================================================
RCS file: /web/www/www/graphics/po/graphics.ja-diff.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- po/graphics.ja-diff.html    23 Mar 2020 14:32:01 -0000      1.35
+++ po/graphics.ja-diff.html    22 Nov 2022 12:00:51 -0000      1.36
@@ -10,8 +10,8 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.86 --&gt;
+&lt;!--#include virtual="/server/html5-header.html" --&gt;
+&lt;!-- Parent-Version: 1.96 --&gt;
    &lt;!--#if expr="$QUERY_STRING = /theme=([^&#]+)/"
 --&gt;&lt;!--#set var="THEME" value="$1"
 --&gt;&lt;!--#endif
@@ -25,43 +25,47 @@
     display: inline-block;
     margin: .5em;
 }
-a:hover img {
-    opacity: 0.7;
-    filter: alpha(opacity=70); /* For IE8 and earlier */
-}
-.button a {
-    display: inline-block;
-}
-table {
+.gnu-art {
     display: block;
     max-width: 100%;
     margin: auto;
     overflow: auto;
 }
-tr {
+.gnu-art tr {
     display: inline-block;
     width: 18.5em;
 }
-table td {
+.gnu-art td {
     padding: 0 .5em;
     border: none;
 }
+.gnu-art td:first-child a {
+    background: none;
+}
+.gnu-art img {
+    width: 5em;
+    height: 5em;
+}
+.gnu-art a:hover img {
+    opacity: 0.7;
+    filter: alpha(opacity=70); /* For IE8 and earlier */
+}
 @media (min-width: 22em) {
-    table {
+    .gnu-art {
         width: 20.5em;
     }
-    tr {
+    .gnu-art tr {
         width: 19em;
         margin: .5em;
     }
 }
 @media (min-width: 44em) {
-    table {
+    .gnu-art {
         width: 41em;
     }
 }
 @media (min-width: 65.5em) {
-    table {
+    .gnu-art {
         width: 61.5em;
     }
 }
@@ -69,6 +73,7 @@
 &lt;!--#include virtual="/graphics/po/graphics.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;h2&gt;The GNU Art Gallery&lt;/h2&gt;
+&lt;div class="thin"&gt;&lt;/div&gt;
 
 &lt;p&gt;Besides the GNU website, you will find some of these designs on the
 covers of &lt;a href="/doc/doc.html"&gt;GNU Manuals&lt;/a&gt;, on &lt;a
@@ -92,7 +97,7 @@
 &lt;p&gt;*** Many thanks to all the artists! ***&lt;/p&gt;
 
 &lt;form id="select" action="#whats-new"&gt;
-&lt;div&gt;&lt;strong&gt;Select by theme:&lt;/strong&gt;&lt;br /&gt;
+&lt;div&gt;&lt;label for="theme"&gt;&lt;strong&gt;Select by 
theme:&lt;/strong&gt;&lt;/label&gt;&lt;br /&gt;
 &lt;select name="theme" id="theme" title="Theme"&gt;
 &lt;option value=""&gt;all&lt;/option&gt;
 &lt;!--#if expr="$THEME = gnuhead"
@@ -124,11 +129,14 @@
 --&gt;&lt;option 
value="surveillance"&gt;surveillance&lt;/option&gt;&lt;!--#endif 
--&gt;&lt;/select&gt;
 &lt;/div&gt;
 
-&lt;div&gt;&lt;strong&gt;Select by type:&lt;/strong&gt;&lt;br /&gt;
+&lt;div&gt;&lt;label for="type"&gt;&lt;strong&gt;Select by 
type:&lt;/strong&gt;&lt;/label&gt;&lt;br /&gt;
 &lt;select name="type" id="type" title="Type"&gt;
 &lt;option value=""&gt;all&lt;/option&gt;
 &lt;!--#if expr="$TYPE = ascii"
---&gt;&lt;option value="ascii" selected="selected"&gt;ASCII / TTY 
art&lt;/option&gt;&lt;!--#else
+--&gt;&lt;option <span class="inserted"><ins><em>value="ai" 
selected="selected"&gt;AI art&lt;/option&gt;&lt;!--#else
+--&gt;&lt;option value="ai"&gt;AI art&lt;/option&gt;&lt;!--#endif --&gt;
+&lt;!--#if expr="$TYPE = ascii"
+--&gt;&lt;option</em></ins></span> value="ascii" selected="selected"&gt;ASCII 
/ TTY art&lt;/option&gt;&lt;!--#else
 --&gt;&lt;option value="ascii"&gt;ASCII / TTY art&lt;/option&gt;&lt;!--#endif 
--&gt;
 &lt;!--#if expr="$TYPE = banner"
 --&gt;&lt;option value="banner" selected="selected"&gt;banner / badge / 
t-shirt&lt;/option&gt;&lt;!--#else
@@ -165,108 +173,98 @@
 
 &lt;h3 id="whats-new"&gt;What's new?&lt;/h3&gt;
 
-&lt;table&gt;
+&lt;table class="gnu-art"&gt;
 &lt;tr style="display:none"&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!-- Dummy 
entry for xhtml validation.
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-              && $TYPE  = <span class="inserted"><ins><em>/^(svg|logo|)$/" 
--&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = <span 
class="removed"><del><strong>/^((gnu|tux|fs|),(poster|wallaper|))$/"</strong></del></span>
 <span class="inserted"><ins><em>/^((gnuhead|fs|),(banner|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/chan-i-love-fs-banner.html"&gt;
+    &lt;img src="/graphics/icons/chan-i-love-fs-banner.80.png"
+         alt="&nbsp;[Banner in cartoon style promoting free software]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;October 2022: I Love Free Software&lt;br /&gt;
+    &lt;small&gt;by Carlos 
Chan&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = 
/^((gnu|gnuhead|),(ai|banner|poster|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/ai-art.html"&gt;
+    &lt;img src="/graphics/icons/ai-gnu-news.80.png"
+         alt="&nbsp;[Gnu with wood-like hair structure]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;September 2022: GNU-themed AI 
art&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = 
/^((gnu|tux|fs|),(poster|wallpaper|))$/"</em></ins></span> --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/techy-gnu-tux-bivouac.html"&gt;
+    &lt;img src="/graphics/icons/techy-gnu-tux-bivouac.80.png"
+         alt="&nbsp;[Gnu and Tux bivouac in the desert]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;October 2021: Gnu and Tux Bivouac&lt;br /&gt;
+    &lt;small&gt;by Muhammed Omar Ali &amp; 
Fatamy&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(poster|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/amihud-4-freedoms.html"&gt;
+    &lt;img src="/graphics/icons/amihud-4-freedoms.80.png"
+         alt="&nbsp;[Poster defining the four freedoms]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;August 2021: Four-Freedoms Poster&lt;br /&gt;
+    &lt;small&gt;by Jeison Yehuda 
Amihud&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(poster|wallpaper|))$/" 
--&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/goschler-its-me-and-gnu.html"&gt;
+    &lt;img src="/graphics/icons/goschler-flower-fractal.80.png"
+         alt="&nbsp;[Flower fractal]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;May 2021: It's Me and GNU&lt;br /&gt;
+    &lt;small&gt;by Stefan 
Goschler&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|wallpaper|))$/" 
--&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/sventsitsky-sadgnu.html"&gt;
+    &lt;img src="/graphics/icons/sventsitsky-sadgnu.80.png"
+         alt="&nbsp;[Sad GNU and Tux]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;May 2021: Sad GNU and Tux&lt;br /&gt;
+    &lt;small&gt;by Nadia 
Sventsitsky&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(poster|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/sevinc-gnu-watercolor.html"&gt;
+    &lt;img src="/graphics/icons/sevinc-gnu-watercolor.80.png"
+         alt="&nbsp;[Watercolor GNU Head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;May 2021: GNU Mascot Watercolor&lt;br /&gt;
+    &lt;small&gt;by Uzay Onat 
Sevinç&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|banner|svg|))$/" 
--&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a 
href="/graphics/gnu-silhouette-logos/gnu-silhouette-logos.html"&gt;
+    &lt;img src="/graphics/icons/gnu-profile.80.png"
+         alt="&nbsp;[Silhouette of a GNU head, in profile]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;March 2021: GNU Silhouette Logos&lt;br /&gt;
+    &lt;small&gt;by JC&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(wallpaper|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/wilgus-gnutiling.html"&gt;
+    &lt;img src="/graphics/icons/wilgus-gnutiling-embossed.80.png"
+         alt="&nbsp;[Embossed GNU-head tiling]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;May 2020: GNU-Head Tiling wallpapers&lt;br /&gt;
+    &lt;small&gt;by Kacper 
Wilgus&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-smiling.html"&gt;
     &lt;img src="/graphics/icons/gnu-smiling.80.png"
           alt="&nbsp;[Smiling GNU head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;March 2020: GNU Smiling&lt;br /&gt;
     &lt;small&gt;by Las&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(tux|gnu|)$/
-              && $TYPE  = /^(banner|)$/" --&gt;
+<span class="removed"><del><strong>--&gt;&lt;!--#if expr="$THEME,$TYPE = 
/^((tux|gnu|),(banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/holiday_deliveries.html"&gt;
     &lt;img src="/graphics/icons/holiday_deliveries.80.png"
           alt="&nbsp;[Freedo, the gnu and the Libreboot deer deliver software 
freedom]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;September 2019: Holiday Deliveries&lt;br /&gt;
     &lt;small&gt;by Jason Self&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(tux|gnu|)$/
-              && $TYPE  = /^(banner|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/happy_gnu_year_2019.html"&gt;
     &lt;img src="/graphics/icons/happy_gnu_year_2019.80.png"
     alt="&nbsp;[Freedo stands in place of the 0 of 2019, and the gnu
     is holding the 9.]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;September 2019: Happy GNU Year 2019!&lt;br /&gt;
     &lt;small&gt;by Jason Self&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(tux|)$/
-              && $TYPE  = /^(banner|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((tux|),(banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/freedo_on_the_beach.html"&gt;
     &lt;img src="/graphics/icons/freedo_on_the_beach.80.png"
           alt="&nbsp;[Freedo taking a vacation on the beach]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;September 2019: Freedo on the beach&lt;br /&gt;
     &lt;small&gt;by Jason Self&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(tux|)$/
-              && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((tux|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/freedo.html"&gt;
     &lt;img src="/graphics/icons/freedo_improved.80.png"
           alt="&nbsp;[A penguin getting out of the shower]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;September 2019: Freedo, the GNU Linux-libre mascot&lt;br /&gt;
     &lt;small&gt;by Rub&eacute;n Rodr&iacute;guez 
P&eacute;rez&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-              && $TYPE  = /^(banner|logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/modern_art_gnu.html"&gt;
     &lt;img src="/graphics/icons/modern_art_gnu.80.png"
           alt="&nbsp;[Modern-style GNU head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;September 2019: a representation of GNU head in modern art 
style&lt;br /&gt;
-    &lt;small&gt;by Angelo A.&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  =</em></ins></span> /^(logo|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/barr-gnu.html"&gt;
-    &lt;img src="/graphics/icons/barr-gnu.80.png"
-         alt="&nbsp;[GNU logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;September 2018: GNU logo&lt;br /&gt;
-    &lt;small&gt;by Paul Barr&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gg3po.html"&gt;
-    &lt;img src="/graphics/icons/gg3po-newGnu.80.png"
-         alt="&nbsp;[New GNU]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;August 2018: New GNU&lt;br /&gt;
-    &lt;small&gt;by gg3po&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(banner|logo|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/arantxa.html"&gt;
-    &lt;img src="/graphics/icons/arantxa-glitch.80.png"
-         alt="&nbsp;[Glitch]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;July 2018: Sunny GNU designs&lt;br /&gt;
-    &lt;small&gt;by Arantxa 
Serantes&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|rms|)$/
-               && $TYPE  = /^(cartoon|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="https://librefan.eu.org/node/787"&gt;
-    &lt;img src="/graphics/icons/pepper-and-carrot-24.80.png"
-         alt="&nbsp;[Pepper &amp; Carrot]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;May 2018: &lt;em&gt;Pepper &amp; Carrot&lt;/em&gt; episode 24 
&ndash; a free
-    software cartoon&lt;br /&gt;
-    &lt;small&gt;by Librefan&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/freedom-reflection.html"&gt;
-    &lt;img src="/graphics/icons/freedom-reflection.80.png"
-         alt="&nbsp;[Reflecting on GNU and freedom]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;May 2018: Freedom Reflection&lt;br /&gt;
-    &lt;small&gt;by Crista 
Moreno&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|emacs|)$/
-               && $TYPE  = /^(wallpaper|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a 
href="https://goblinrefuge.com/mediagoblin/u/emacsomancer/m/my-god-it-s-full-of-car-s-png"&gt;
-    &lt;img src="/graphics/icons/lisp-meditate.80.png"
-         alt="&nbsp;[Meditating GNU with Lisp on background]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;January 2018: My God, it's full of &lsquo;car&rsquo;s!&lt;br 
/&gt;
-    &lt;small&gt;by Benjamin 
Slade&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
-<span class="removed"><del><strong>--&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(poster|svg|wallpaper|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/flying-gnu.html"&gt;
-    &lt;img src="/graphics/icons/flying-gnu.80.png"
-         alt="&nbsp;[Flying GNU Design]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;October 2017: Flying Gnu&lt;br /&gt;
-    &lt;small&gt;by Ernesto 
Bazzano&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(banner|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/r4sh-gnu-vaporwave.html"&gt;
-    &lt;img src="/graphics/icons/r4sh-gnu-vaporwave.80.png"
-         alt="&nbsp;[GNU Vaporwave Design]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;September 2017: GNU Vaporwave Design&lt;br /&gt;
-    &lt;small&gt;by 
R4sH&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif</strong></del></span>
+    &lt;small&gt;by Angelo 
A.&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif</strong></del></span>
 --&gt;
 &lt;/table&gt;
 
@@ -274,727 +272,673 @@
 
 &lt;p class="button"&gt;&lt;a href="#collections"&gt;Next 
section&lt;/a&gt;&lt;/p&gt;
 
-&lt;table&gt;
+&lt;table class="gnu-art"&gt;
 &lt;tr style="display:none"&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!-- Dummy 
entry for xhtml validation.
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|)$/
-               && $TYPE  = /^$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|),)$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/3dbabygnutux.html"&gt;
     &lt;img src="/graphics/icons/BabyGnuTux.80.png"
          alt="&nbsp;[3D baby GNU and baby Tux]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;3D Baby Gnu &amp; Baby Tux&lt;br /&gt;
     &lt;small&gt;by Nicolas 
Rougier&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),)$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/3dgnuhead.html"&gt;
     &lt;img src="/graphics/icons/3dgnuhead.80.png"
          alt="&nbsp;[Portrait of GNU]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Portrait of GNU&lt;br /&gt;
     &lt;small&gt;by Dale 
Mellor&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),)$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/agnubody.html"&gt;
     &lt;img src="/graphics/icons/agnubody.80.png"
          alt="&nbsp;[A Gnu Body]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;A Gnu Body&lt;br /&gt;
     &lt;small&gt;by Graham 
Wilson&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(svg|ascii|logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|ascii|logo|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/agnuhead.html"&gt;
     &lt;img src="/graphics/icons/gnu-head.80.png"
          alt="&nbsp;[Image of the head of a GNU]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;A GNU Head&lt;br /&gt;
     &lt;small&gt;by Etienne Suvasa,&lt;br /&gt;
     and derived images&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(ascii|logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(ascii|logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/agnuheadterm.html"&gt;
     &lt;img src="/graphics/icons/agnuheadterm.80.png"
          alt="&nbsp;[GNU Head for terminal]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;A GNU Head in terminals&lt;br /&gt;
     &lt;small&gt;by Mattias 
Andrée&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/ahurdlogo.html"&gt;
     &lt;img src="/graphics/icons/hurd-logo.80.png"
          alt="&nbsp;[Spherical Hurd Logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Spherical Hurd Logo&lt;br /&gt;
     &lt;small&gt;by Teddy 
Hogeborn&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = <span 
class="inserted"><ins><em>/^((gnu|gnuhead|),(ai|banner|poster|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/ai-art.html"&gt;
+    &lt;img src="/graphics/icons/ai-gnu-news.80.png"
+         alt="&nbsp;[Gnu with wood-like hair structure]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;GNU-themed AI art&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE =</em></ins></span> 
/^((gnuhead|),(ascii|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/alternative-ascii.html"&gt;
+    &lt;img src="/graphics/icons/alternative-ascii.80.png"
+         alt="&nbsp;[ASCII GNU head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;An Alternative ASCII GNU&lt;br /&gt;
+    &lt;small&gt;by Vijay 
Kumar&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(poster|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/amihud-4-freedoms.html"&gt;
+    &lt;img src="/graphics/icons/amihud-4-freedoms.80.png"
+         alt="&nbsp;[Poster defining the four freedoms]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;Four-Freedoms Poster&lt;br /&gt;
+    &lt;small&gt;by Jeison Yehuda 
Amihud&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/anfsflogo.html"&gt;
     &lt;img src="/graphics/icons/fsf-bk.80.png"
          alt="&nbsp;[FSF Logo on black]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;FSF logos&lt;br /&gt;
     &lt;small&gt;by Shawn 
Ewald&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/anlpflogo.html"&gt;
     &lt;img src="/graphics/icons/liberty.80.png"
          alt="&nbsp;[Statue of Liberty protecting software freedoms]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;An LPF logo&lt;br /&gt;
     &lt;small&gt;by Etienne 
Suvasa&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(svg|banner|logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(svg|banner|logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/atypinggnu.html"&gt;
     &lt;img src="/graphics/icons/gnu-type.80.png"
          alt="&nbsp;[Typing GNU hacker]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;A typing GNU hacker&lt;br /&gt;
     &lt;small&gt;by Jamal 
Hannah&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/anothertypinggnu.html"&gt;
     &lt;img src="/graphics/icons/another-gnu-type.80.png"
          alt="&nbsp;[Another typing GNU hacker]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Another typing GNU hacker&lt;br /&gt;
     &lt;small&gt;by Peter 
McLachlan&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(banner|logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/arantxa.html"&gt;
     &lt;img src="/graphics/icons/arantxa-glitch.80.png"
          alt="&nbsp;[Glitch]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Sunny GNU designs&lt;br /&gt;
     &lt;small&gt;by Arantxa 
Serantes&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/babygnu.html"&gt;
     &lt;img src="/graphics/icons/baby-gnu.80.png"
          alt="&nbsp;[Baby GNU sucking its thumb]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Baby GNU&lt;br /&gt;
     &lt;small&gt;by Etienne 
Suvasa&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/barr-gnu.html"&gt;
     &lt;img src="/graphics/icons/barr-gnu.80.png"
          alt="&nbsp;[GNU logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Logo&lt;br /&gt;
     &lt;small&gt;by Paul Barr&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|emacs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|emacs|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/bokma-gnu.html"&gt;
     &lt;img src="/graphics/icons/bokma-gnu.80.png"
          alt="&nbsp;[GNU logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU and Emacs Logos&lt;br /&gt;
     &lt;small&gt;by John Bokma&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/bold-initiative-GNU-head.html"&gt;
     &lt;img src="/graphics/icons/bold-initiative-GNU-head.80.png"
          alt="&nbsp;[Winking GNU Head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Winking GNU&lt;br /&gt;
     &lt;small&gt;by Bravo 
Edison&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|gnu|tux|)$/
-               && $TYPE  = /^(banner|button|icon|logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|),(banner|button|icon|logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/BVBN.html"&gt;
     &lt;img src="/graphics/icons/bvbn-logo-small.80.png"
          alt="&nbsp;[GNU Head logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU/Linux buttons&lt;br /&gt;
     &lt;small&gt;by Vladimir 
Tsarkov&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/bwcartoon.html"&gt;
     &lt;img src="/graphics/icons/gnu-and-penguin-color.80.png"
          alt="&nbsp;[The Gnu and the Penguin in flight]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;The Dynamic Duo: The Gnu and the Penguin in flight&lt;br /&gt;
-    &lt;small&gt;by an anonymous 
artist&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(license|)$/
-               && $TYPE  = /^(button|)$/" --&gt;
+    &lt;small&gt;by <span class="removed"><del><strong>an anonymous 
artist&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif</strong></del></span> 
<span class="inserted"><ins><em>Lissanne 
Lake&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|fs|),(banner|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/chan-i-love-fs-banner.html"&gt;
+    &lt;img src="/graphics/icons/chan-i-love-fs-banner.80.png"
+         alt="&nbsp;[Banner in cartoon style promoting free software]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;I Love Free Software&lt;br /&gt;
+    &lt;small&gt;by Carlos 
Chan&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif</em></ins></span>
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((license|),(button|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/copyleft-sticker.html"&gt;
     &lt;img src="/graphics/icons/copyleft-sticker.80.png"
          alt="&nbsp;[&quot;Copyleft (L)&quot; sticker]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;&ldquo;Copyleft (L)&rdquo; sticker&lt;br /&gt;
     &lt;small&gt;by Don 
Hopkins&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(drm|)$/
-               && $TYPE  = /^(banner|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((drm|),(banner|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a 
href="/graphics/digital-restrictions-management.html"&gt;
     &lt;img src="/graphics/icons/ichain.80.png"
          alt="&nbsp;[The chains of Digital Restrictions
            Management]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Art &mdash; Digital Restrictions Management&lt;br /&gt;
     &lt;small&gt;by Chris 
Hayes&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/distros-dragora.html"&gt;
     &lt;img src="/graphics/icons/distros-dragora.80.png"
          alt="&nbsp;[Dragora Logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;Dragora Logo&lt;br /&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(wallpaper|)$/" --&gt;
+    &lt;td&gt;Dragora Logo&lt;br <span 
class="removed"><del><strong>/&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif</strong></del></span>
 <span class="inserted"><ins><em>/&gt;
+    &lt;small&gt;by Claudio 
Santillan&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif</em></ins></span>
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(wallpaper|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/dittberner-gnu.html"&gt;
     &lt;img src="/graphics/icons/dittberner_gnu.80.png"
          alt="&nbsp;[Running gnu]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Running Gnu&lt;br /&gt;
     &lt;small&gt;by Dorothea and Jan 
Dittberner&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(surveillance|)$/
-               && $TYPE  = /^(cartoon|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((surveillance|),(cartoon|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/dog.html"&gt;
     &lt;img src="/graphics/icons/dog.80.png"
          alt="&nbsp;[Dog, wondering at pop-up ads]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Dog Cartoon&lt;br /&gt;
     &lt;small&gt;by Richard Stallman and 
Antonomakia&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(emacs|)$/
-               && $TYPE  = /^(wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((emacs|),(wallpaper|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/emacs-ref.html"&gt;
     &lt;img src="/graphics/icons/emacs-ref.80.png"
          alt="&nbsp;[Reference card with GNU face]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Emacs Reference Card&lt;br /&gt;
     &lt;small&gt;by Loic Duros&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(poster|svg|wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(poster|svg|wallpaper|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/flying-gnu.html"&gt;
     &lt;img src="/graphics/icons/flying-gnu.80.png"
          alt="&nbsp;[Flying GNU design]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Flying Gnu&lt;br /&gt;
     &lt;small&gt;by Ernesto 
Bazzano&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = <span class="inserted"><ins><em>/^(tux|)$/
-              && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((tux|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/freedo.html"&gt;
     &lt;img src="/graphics/icons/freedo_improved.80.png"
           alt="&nbsp;[A penguin getting out of the shower]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Freedo&lt;br /&gt;
     &lt;small&gt;by Rub&eacute;n Rodr&iacute;guez P&eacute;rez (and other 
versions)&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME =</em></ins></span> /^(rms|fs|)$/
-               && $TYPE  = /^(cartoon|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((rms|fs|),(cartoon|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/freedom.html"&gt;
     &lt;img src="/graphics/icons/stallman.80.png"
          alt="&nbsp;[Levitating RMS speaking about freedom]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;What Freedom Means&lt;br /&gt;
     &lt;small&gt;by Michael 
Pagnotti&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/freedom-reflection.html"&gt;
     &lt;img src="/graphics/icons/freedom-reflection.80.png"
          alt="&nbsp;[Reflecting on GNU and freedom]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Freedom Reflection&lt;br /&gt;
     &lt;small&gt;by Crista 
Moreno&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = <span class="inserted"><ins><em>/^(tux|)$/
-              && $TYPE  = /^(banner|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((tux|),(banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/freedo_on_the_beach.html"&gt;
     &lt;img src="/graphics/icons/freedo_on_the_beach.80.png"
           alt="&nbsp;[Freedo taking a vacation on the beach]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Freedo on the beach&lt;br /&gt;
     &lt;small&gt;by Jason Self&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME =</em></ins></span> /^(gnu|tux|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|fs|),(poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/free-software-dealers.html"&gt;
     &lt;img src="/graphics/icons/free-software-dealers.80.png"
          alt="&nbsp;[Gnu and Tux as messengers of free software in the
            desolate land of proprietary software]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;Free-Software Dealers&lt;br /&gt;
+    &lt;td&gt;Free Software Dealers &amp; derived game card&lt;br /&gt;
     &lt;small&gt;by 
P&eacute;h&auml;&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(wallpaper|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/free-your-soul.html"&gt;
     &lt;img src="/graphics/icons/free-your-soul-wallpaper.80.png"
          alt="&nbsp;[Free Your Soul wallpaper]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Free Your Soul wallpaper&lt;br /&gt;
     &lt;small&gt;by Sayem 
Chaklader&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|tux|)$/
-               && $TYPE  = /^(button|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|tux|),(button|svg|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/french-motto.html"&gt;
     &lt;img src="/graphics/icons/LEF.fr.80.png"
          alt="&nbsp;[liberty, equality, brotherhood button]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;French Motto button&lt;br /&gt;
     &lt;small&gt;by Lutz 
B&uuml;rger&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(button|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(button|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/fromagnulinux.html"&gt;
     &lt;img src="/graphics/icons/fromagnulinux.80.png"
          alt="&nbsp;[Fromagnulinux]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Fromagnulinux&lt;br /&gt;
     &lt;small&gt;by Denis 
Trimaille&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/fsf-logo.html"&gt;
     &lt;img src="/graphics/icons/fsf-logo-notext.80.png"
          alt="&nbsp;[The official FSF logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Free Software Foundation Logo&lt;br /&gt;
     &lt;small&gt;by Li Jiang&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/FSFS-logo.html"&gt;
     &lt;img src="/graphics/icons/FSFS-title2.80.png"
          alt="&nbsp;[The book cover logo for 'Free Software, Free 
Society']&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Book cover logo for Free Software, Free Society&lt;br /&gt;
     &lt;small&gt;by Jonathan 
Richard&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gg3po.html"&gt;
     &lt;img src="/graphics/icons/gg3po-newGnu.80.png"
          alt="&nbsp;[New GNU]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;New GNU&lt;br /&gt;
     &lt;small&gt;by gg3po&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(banner|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gleesons.html"&gt;
     &lt;img src="/graphics/icons/gleeson_head.80.png"
          alt="&nbsp;[Colorful rounded image of the head of a GNU]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Art&lt;br /&gt;
     &lt;small&gt;by Brendon 
Gleeson&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gNewSense.html"&gt;
     &lt;img src="/graphics/icons/gnewsense.80.png"
          alt="&nbsp;[gNewSense Logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;gNewSense Logo&lt;br /&gt;
     &lt;small&gt;by Li Jiang&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(banner|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-30.html"&gt;
     &lt;img src="/graphics/icons/gnu-30-badge.80.png"
          alt="&nbsp;[GNU 30th - Celebrating 30 years]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU 30th birthday&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-alternative.html"&gt;
     &lt;img src="/graphics/icons/gnu-alternative.80.png"
          alt="&nbsp;[Stylized gnu mask]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Alternative&lt;br /&gt;
-    &lt;small&gt;by an anonymous 
artist&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = <span 
class="inserted"><ins><em>/^(gnuhead|tux|)$/
-               && $TYPE  = /^(icon|)$/" --&gt;
+    &lt;small&gt;by <span class="removed"><del><strong>an anonymous 
artist&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif</strong></del></span> 
<span class="inserted"><ins><em>Martin R. 
Peck&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif</em></ins></span>
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|tux|),(icon|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-and-tux-icon.html"&gt;
     &lt;img src="/graphics/icons/gnu-and-tux-icon.80.png"
          alt="&nbsp;[Gnu and Tux icon]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Gnu and Tux Icon&lt;br /&gt;
-    &lt;small&gt;by Sventsitskaya 
Nadezda&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME =</em></ins></span> /^(gnuhead|)$/
-               && $TYPE  = /^(ascii|)$/" --&gt;
+    &lt;small&gt;by Nadia 
Sventsitsky&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(ascii|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-ascii.html"&gt;
     &lt;img src="/graphics/icons/gnu-ascii.80.png"
          alt="&nbsp;[ASCII Gnu head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;ASCII GNU&lt;br /&gt;
     &lt;small&gt;by Przemys&#322;aw 
Borys&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(ascii|button|icon|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(ascii|button|icon|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-ascii2.html"&gt;
     &lt;img src="/graphics/icons/gnu-ascii2.80.png"
          alt="&nbsp;[Small ASCII Gnu head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Another ASCII GNU (for email signatures)&lt;br /&gt;
     &lt;small&gt;by Martin 
Dickopp&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(ascii|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(ascii|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-ascii-liberty.html"&gt;
     &lt;img src="/graphics/icons/gnu-ascii-liberty.80.png"
          alt="&nbsp;[ASCII Gnu is liberty]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;ASCII &ldquo;GNU is Liberty&rdquo;&lt;br /&gt;
     &lt;small&gt;by Carlos Contreras 
A.&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(badge|wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(badge|wallpaper|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-born-free-run-free.html"&gt;
     &lt;img src="/graphics/icons/gnu-born-free-run-free.80.png"
          alt="&nbsp;[GNU Born Free Runs Free]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Born Free Runs Free&lt;br /&gt;
     &lt;small&gt;by Alicia 
Lapekas&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-head-luk.html"&gt;
     &lt;img src="/graphics/icons/gnu-head-luk.80.png"
          alt="&nbsp;[Luk's GNU head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Stylized GNU Head&lt;br /&gt;
     &lt;small&gt;by Luk&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-head-shadow.html"&gt;
     &lt;img src="/graphics/icons/gnu_headshadow.80.png"
          alt="&nbsp;[GNU banner saying: run free run gnu]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Head shadowed&lt;br /&gt;
     &lt;small&gt;by Vladimir 
Z&uacute;&ntilde;iga&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(banner|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-inside.html"&gt;
     &lt;img src="/graphics/icons/gnu-inside.80.png"
          alt="&nbsp;[Fragment of the head of a GNU]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Inside&lt;br /&gt;
     &lt;small&gt;by Mike 
Gerwitz&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),)$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-jacket.html"&gt;
     &lt;img src="/graphics/icons/gnu-jacket.80.png"
          alt="&nbsp;[Gnu wearing a jacket]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;A Gnu Wearing a Jacket&lt;br /&gt;
     &lt;small&gt;by Sarah Katzenell 
Rabkin&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^$/
-               && $TYPE  = /^(logo|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^(,(logo|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-linux-logos.html"&gt;
     &lt;img src="/graphics/icons/powered-by-gnu-linux.80.png"
          alt="&nbsp;[Powered by GNU/Linux]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU/Linux logos&lt;br /&gt;
     &lt;small&gt;by Burkhard 
Jäckel&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|)$/
-               && $TYPE  = /^(wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(wallpaper|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-slash-linux.html"&gt;
     &lt;img src="/graphics/icons/gnu-linux-on-black.80.png"
          alt="&nbsp;[Gnu and Tux on black]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU/Linux Art&lt;br /&gt;
     &lt;small&gt;by Rui Damas&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-              && $TYPE  = <span class="inserted"><ins><em>/^(svg|logo|)$/" 
--&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-smiling.html"&gt;
     &lt;img src="/graphics/icons/gnu-smiling.80.png"
           alt="&nbsp;[Smiling GNU head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Smiling&lt;br /&gt;
     &lt;small&gt;by Las&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  =</em></ins></span> /^(banner|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnubanner.html"&gt;
     &lt;img src="/graphics/icons/gnubanner-2.80.png"
          alt="&nbsp;[Come and see what GNU creates for YOU]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU banners and link&lt;br /&gt;
     &lt;small&gt;resp. by Stefan Rieken, John M. Wooten
     and SpAwN&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(logo|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnuhornedlogo.html"&gt;
     &lt;img src="/graphics/icons/gnu_hornedword.80.png"
          alt="&nbsp;[GNU Horned Word Logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Horned Logo&lt;br /&gt;
     &lt;small&gt;by Vladimir 
Z&uacute;&ntilde;iga&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnulove.html"&gt;
     &lt;img src="/graphics/icons/Gnulove.80.png"
          alt="&nbsp;[GNU Love]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Love&lt;br /&gt;
     &lt;small&gt;by Alison 
Upton&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(plastic|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(plastic|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnuolantern.html"&gt;
     &lt;img src="/graphics/icons/GNUoLantern.80.png"
          alt="&nbsp;[GNUoLantern]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU o Lantern&lt;br /&gt;
     &lt;small&gt;carved by Lorena 
Cid-Montiel&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|fs|)$/
-               && $TYPE  = /^(badge|logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|fs|),(badge|logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnupascal.html"&gt;
     &lt;img src="/graphics/icons/Gnu+Pascal.80.png"
          alt="&nbsp;[A Gnu and Blaise Pascal]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU and Blaise Pascal&lt;br /&gt;
     &lt;small&gt;by Markus 
Gerwinski&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(plastic|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(plastic|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnupumpkin.html"&gt;
     &lt;img src="/graphics/icons/gnupumpkin.80.png"
          alt="&nbsp;[GNU Pumpkin]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Pumpkin&lt;br /&gt;
     &lt;small&gt;carved by Jimmy 
Rustles&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|banner|svg|))$/" 
--&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a 
href="/graphics/gnu-silhouette-logos/gnu-silhouette-logos.html"&gt;
+    &lt;img src="/graphics/icons/gnu-profile.80.png"
+         alt="&nbsp;[Silhouette of a GNU head, in profile]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;GNU Silhouette Logos&lt;br /&gt;
+    &lt;small&gt;by JC&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(poster|wallpaper|))$/" 
--&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/goschler-its-me-and-gnu.html"&gt;
+    &lt;img src="/graphics/icons/goschler-flower-fractal.80.png"
+         alt="&nbsp;[Flower fractal]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;It's Me and GNU&lt;br /&gt;
+    &lt;small&gt;by Stefan 
Goschler&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/groff-head.html"&gt;
     &lt;img src="/graphics/icons/groff-head.80.png"
          alt="&nbsp;[Head of a GNU with a printing press]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Head with Printing Press&lt;br /&gt;
     &lt;small&gt;by Imogen 
Mulley&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = <span class="inserted"><ins><em>/^(tux|gnu|)$/
-              && $TYPE  = /^(banner|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/happy_gnu_year_2019.html"&gt;
     &lt;img src="/graphics/icons/happy_gnu_year_2019.80.png"
     alt="&nbsp;[Freedo stands in place of the 0 of 2019, and the gnu
     is holding the 9.]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Happy GNU Year 2019!&lt;br /&gt;
     &lt;small&gt;by Jason Self&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME =</em></ins></span> /^(gnuhead|)$/
-               && $TYPE  = /^(logo|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/heckert_gnu.html"&gt;
     &lt;img src="/graphics/icons/heckert_gnu.80.png"
          alt="&nbsp;[Bold image of the head of a GNU]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;A Bold GNU Head&lt;br /&gt;
     &lt;small&gt;by Aur&eacute;lio A. 
Heckert&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(wallpaper|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/hitflip-gnu.html"&gt;
     &lt;img src="/graphics/icons/hitflip-gnu.80.png"
          alt="&nbsp;[GNU coin]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Coin and Herd&lt;br /&gt;
     &lt;small&gt;by the Hitflip 
Team&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = <span class="inserted"><ins><em>/^(tux|gnu|)$/
-              && $TYPE  = /^(banner|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/holiday_deliveries.html"&gt;
     &lt;img src="/graphics/icons/holiday_deliveries.80.png"
           alt="&nbsp;[Freedo, the gnu and the Libreboot deer deliver software 
freedom]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Holiday Deliveries&lt;br /&gt;
     &lt;small&gt;by Jason Self&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME =</em></ins></span> /^(fs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/httptunnel-logo.html"&gt;
     &lt;img src="/graphics/icons/httptunnel-w.80.png"
          alt="&nbsp;[HTTPTunnel logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;HTTPTunnel Logo&lt;br /&gt;
     &lt;small&gt;by Harri 
Manni&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/hurd_mf.html"&gt;
     &lt;img src="/graphics/icons/hurd_mf.80.png"
          alt="&nbsp;[Hurd Metafont logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Hurd Logo in Metafont&lt;br /&gt;
     &lt;small&gt;by Stephen 
McCamant&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^$/
-               && $TYPE  = /^(cartoon|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^(,(cartoon|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/jesus-cartoon.html"&gt;
     &lt;img src="/graphics/icons/jesus-cartoon.80.png"
          alt="&nbsp;[Bill Gates and Jesus]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;A cartoon featuring Jesus and...&lt;br /&gt;
     &lt;small&gt;by Phil Garcia and Don 
Berry&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/kafa.html"&gt;
     &lt;img src="/graphics/icons/kafa_gnu.80.png"
          alt="&nbsp;[Abstract art of the  GNU]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Abstract GNU Art&lt;br /&gt;
     &lt;small&gt;by Kursad 
Karatas&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(badge|poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(badge|poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/listen.html"&gt;
     &lt;img src="/graphics/icons/listen.80.png"
          alt="&nbsp;[Listening Gnu]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Listening Gnu&lt;br /&gt;
     &lt;small&gt;by the Nevrax Design 
Team&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),)$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/lovchik-gnu.html"&gt;
     &lt;img src="/graphics/icons/gnu_head_colour.80.png"
          alt="&nbsp;[Colored GNU head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Colored GNU Head&lt;br /&gt;
     &lt;small&gt;by Lisa J. 
Lovchik&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(badge|button|icon|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(badge|button|icon|svg|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/meditate.html"&gt;
     &lt;img src="/graphics/icons/meditate.80.png"
          alt="&nbsp;[Levitating, Meditating, Flue-playing Gnu]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Levitating, Meditating, Flute-playing Gnu&lt;br /&gt;
     &lt;small&gt;by the Nevrax Design 
Team&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|tux|)$/
-               && $TYPE  = /^(icon|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-and-tux-icon.html"&gt;
-    &lt;img src="/graphics/icons/gnu-and-tux-icon.80.png"
-         alt="&nbsp;[Gnu and Tux icon]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;Gnu and Tux Icon&lt;br /&gt;
-    &lt;small&gt;by Sventsitskaya 
Nadezda&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = <span class="inserted"><ins><em>/^(gnuhead|)$/
-              && $TYPE  = /^(banner|logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/modern_art_gnu.html"&gt;
     &lt;img src="/graphics/icons/modern_art_gnu.80.png"
           alt="&nbsp;[Modern-style GNU head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Modern-style GNU Head&lt;br /&gt;
     &lt;small&gt;by Angelo A.&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME =</em></ins></span> /^(gnu|)$/
-               && $TYPE  = /^(cartoon|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(cartoon|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/nandakumar-gnu.html"&gt;
     &lt;img src="/graphics/icons/gnu-gives-freedom.80.png"
          alt="&nbsp;[GNU liberating a computer]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Gives Freedom poster&lt;br /&gt;
     &lt;small&gt;by Nandakumar&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(cartoon|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(cartoon|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/navaneeth-gnu.html"&gt;
     &lt;img src="/graphics/icons/give-me-freedom.80.png"
          alt="&nbsp;[A computer dreaming about GNU for freedom]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Give Me Freedom poster&lt;br /&gt;
     &lt;small&gt;by Navaneeth&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/philosophicalgnu.html"&gt;
     &lt;img src="/graphics/icons/philosophical-gnu.80.png"
          alt="&nbsp;[Philosophical Gnu]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;A Philosophical Gnu&lt;br /&gt;
     &lt;small&gt;by Markus 
Gerwinski&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/philosoputer.html"&gt;
     &lt;img src="/graphics/icons/philosoputer.80.png"
          alt="&nbsp;[Digital philosopher]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Philosoputer&lt;br /&gt;
     &lt;small&gt;by Braydon 
Fuller&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|)$/
-               && $TYPE  = /^(wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(wallpaper|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/plant-onion.html"&gt;
     &lt;img src="/graphics/icons/plant-onion.80.png"
          alt="&nbsp;[Gnu and Tux plant onions]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Plant Onions!&lt;br /&gt;
     &lt;small&gt;by 
P&eacute;h&auml;&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(banner|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/r4sh-gnu-vaporwave.html"&gt;
     &lt;img src="/graphics/icons/r4sh-gnu-vaporwave.80.png"
          alt="&nbsp;[GNU Vaporwave Design]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Vaporwave Design&lt;br /&gt;
     &lt;small&gt;by R4sH&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),)$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/reiss-gnuhead.html"&gt;
     &lt;img src="/graphics/icons/reiss-head.80.png"
          alt="&nbsp;[Colored GNU head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Color GNU Head&lt;br /&gt;
     &lt;small&gt;by Joseph W. 
Reiss&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(banner|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/runfreegnu.html"&gt;
     &lt;img src="/graphics/icons/runfreegnu.80.png"
          alt="&nbsp;['Run free run GNU' banner]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Run free run GNU banner&lt;br /&gt;
     &lt;small&gt;by Vladimir 
Z&uacute;&ntilde;iga&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/santa-gnu.html"&gt;
     &lt;img src="/graphics/icons/Santa_GNU.80.png"
          alt="&nbsp;[Santa Claus GNU]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Santa Claus GNU&lt;br /&gt;
     &lt;small&gt;by Luciano 
Louren&ccedil;o&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/scowcroft.html"&gt;
     &lt;img src="/graphics/icons/gnu-beast.80.png"
          alt="&nbsp;[GNU beast poster]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Gnu Characters&lt;br /&gt;
     &lt;small&gt;by Carol Anne 
Scowcroft&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(poster|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/sevinc-gnu-watercolor.html"&gt;
+    &lt;img src="/graphics/icons/sevinc-gnu-watercolor.80.png"
+         alt="&nbsp;[Watercolor GNU Head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;GNU Mascot Watercolor&lt;br /&gt;
+    &lt;small&gt;by Uzay Onat 
Sevinç&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/skwetu-gnu-logo.html"&gt;
     &lt;img src="/graphics/icons/skwetu-gnu-logo.80.png"
          alt="&nbsp;[Skwetu's GNU Logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Salish GNU logo&lt;br /&gt;
     &lt;small&gt;by Skwetu&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|fs|)$/
-               && $TYPE  = /^(banner|wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|fs|),(banner|wallpaper|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/skwid-wallpapers.html"&gt;
     &lt;img src="/graphics/icons/skwid-free-side-wallpaper.80.png"
          alt="&nbsp;[Free Side of the Force wallpaper]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Designs&lt;br /&gt;
     &lt;small&gt;by Ben &ldquo;Skwid&rdquo; 
Gailly&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(logo|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/slickgnu.html"&gt;
     &lt;img src="/graphics/icons/slickgnu.80.png"
          alt="&nbsp;[A slick GNU logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;A Slick GNU Logo&lt;br /&gt;
     &lt;small&gt;by Brian Bush&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/social.html"&gt;
     &lt;img src="/graphics/icons/gnu-social-logo.80.png"
          alt="&nbsp;[GNU social Logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Social logo&lt;br /&gt;
     &lt;small&gt;by Jonas Laugs and Steven 
DuBois&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|)$/
-               && $TYPE  = /^(poster|wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|wallpaper|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/spiritoffreedom.html"&gt;
     &lt;img src="/graphics/icons/o_espirito_da_liberdade.fondo.80.png"
          alt="&nbsp;[The Spirit of Freedom]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;The Spirit of Freedom&lt;br /&gt;
     &lt;small&gt;by Denís Fernández 
Cabrera&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(rms|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((rms|),(poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/stallman-as-saint-ignucius.html"&gt;
     &lt;img src="/graphics/icons/stallman-as-saint-ignucius.80.png"
          alt="&nbsp;[Stallman as Saint Ignucius]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Stallman as Saint Ignucius&lt;br /&gt;
     &lt;small&gt;by Alicia 
Lapekas&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(banner|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(banner|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/stark-gnuherd.html"&gt;
     &lt;img src="/graphics/icons/gnu_herd_banner.80.png"
          alt="&nbsp;[GNU banner]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Herd Banner&lt;br /&gt;
     &lt;small&gt;by Stephan Baumann, 
usegroup&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(logo|svg|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/sven-gnuhead.html"&gt;
-    &lt;img src="/graphics/icons/nu-gnu.80.png"
-         alt="&nbsp;[Simplified GNU Head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;Simplified GNU Head&lt;br /&gt;
-    &lt;small&gt;by Sven H.&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(ascii|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(ascii|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/supergnu-ascii.html"&gt;
     &lt;img src="/graphics/icons/supergnu-ascii.80.png"
          alt="&nbsp;[ASCII Super Gnu]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;ASCII Super Gnu&lt;br /&gt;
     &lt;small&gt;by Vijay 
Kumar&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(ascii|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/alternative-ascii.html"&gt;
-    &lt;img src="/graphics/icons/alternative-ascii.80.png"
-         alt="&nbsp;[ASCII GNU head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;An Alternative ASCII GNU&lt;br /&gt;
-    &lt;small&gt;by Vijay 
Kumar&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|svg|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/sven-gnuhead.html"&gt;
+    &lt;img src="/graphics/icons/nu-gnu.80.png"
+         alt="&nbsp;[Simplified GNU Head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;Simplified GNU Head&lt;br /&gt;
+    &lt;small&gt;by Sven H.&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|wallpaper|))$/" 
--&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/sventsitsky-sadgnu.html"&gt;
+    &lt;img src="/graphics/icons/sventsitsky-sadgnu.80.png"
+         alt="&nbsp;[Sad GNU and Tux]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;Sad GNU and Tux&lt;br /&gt;
+    &lt;small&gt;by Nadia 
Sventsitsky&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|fs|),(poster|wallaper|))$/" 
--&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/techy-gnu-tux-bivouac.html"&gt;
+    &lt;img src="/graphics/icons/techy-gnu-tux-bivouac.80.png"
+         alt="&nbsp;[Gnu and Tux bivouac in the desert]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;Gnu and Tux Bivouac&lt;br /&gt;
+    &lt;small&gt;by Muhammed Omar Ali &amp; 
Fatamy&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(wallpaper|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/this-is-freedom-wallpaper.html"&gt;
     &lt;img src="/graphics/icons/this-is-freedom-wallpaper.80.png"
          alt="&nbsp;['This is freedom' wallpaper]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;This is Freedom wallpaper&lt;br /&gt;
     &lt;small&gt;by Vadim Gush&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/Trisquel.html"&gt;
     &lt;img src="/graphics/icons/trisquel.80.png"
          alt="&nbsp;[Trisquel Logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
-    &lt;td&gt;Trisquel Logo&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(badge|banner|)$/" --&gt;
+    &lt;td&gt;Trisquel <span 
class="removed"><del><strong>Logo&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif</strong></del></span>
 <span class="inserted"><ins><em>Logo&lt;br /&gt;
+    &lt;small&gt;by Rub&eacute;n Rodr&iacute;guez 
P&eacute;rez&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif</em></ins></span>
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(badge|banner|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/usegnu.html"&gt;
     &lt;img src="/graphics/icons/use-gnu.80.png"
          alt="&nbsp;[Pseudo-Lisp (Use 'GNU)]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Use 'GNU&lt;br /&gt;
     &lt;small&gt;by Etienne Suvasa and the FSF 
staff&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(badge|banner|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(badge|banner|svg|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/whatsgnu.html"&gt;
     &lt;img src="/graphics/icons/whats-gnu.80.png"
          alt="&nbsp;[GNU head with motto on banderoles]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;What's GNU&lt;br /&gt;
     &lt;small&gt;by Etienne 
Suvasa&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(logo|svg|wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(wallpaper|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/wilgus-gnutiling.html"&gt;
+    &lt;img src="/graphics/icons/wilgus-gnutiling-embossed.80.png"
+         alt="&nbsp;[Embossed GNU-head tiling]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;GNU-Head Tiling wallpapers&lt;br /&gt;
+    &lt;small&gt;by Kacper 
Wilgus&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|svg|wallpaper|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/winkler-gnu.html"&gt;
     &lt;img src="/graphics/icons/winkler-gnu.80.png"
          alt="&nbsp;[Kyle's Alternative GNU logo]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Alternative GNU Logo&lt;br /&gt;
     &lt;small&gt;by Kyle 
Winkler&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|gnu|)$/
-               && $TYPE  = /^$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|gnu|),)$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/adrienne/index.html"&gt;
     &lt;img src="/graphics/icons/dancing-gnu.80.png"
          alt="&nbsp;[A dancing GNU]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU art&lt;br /&gt;
     &lt;small&gt;by Adrienne 
Thompson&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),)$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/bahlon/index.html"&gt;
     &lt;img src="/graphics/icons/3d-gnu-head.80.png"
          alt="&nbsp;[3D Gnu head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Head in 3D&lt;br /&gt;
     &lt;small&gt;by Georg 
Bahlon&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|)$/
-               && $TYPE  = /^(button|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|),(button|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/behroze/index.html"&gt;
     &lt;img src="/graphics/icons/behroze-gnu-button1.80.png"
          alt="&nbsp;[We run GNU]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU buttons&lt;br /&gt;
     &lt;small&gt;by Behroze 
Nejaati&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/fsfsociety/fsfsociety.html"&gt;
     &lt;img src="/graphics/icons/party.80.png"
          alt="&nbsp;[GNU party]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Party&lt;br /&gt;
     &lt;small&gt;by Etienne 
Suvasa&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|emacs|fs|)$/
-               && $TYPE  = /^(banner|button|cartoon|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = 
/^((gnu|tux|emacs|fs|),(banner|button|cartoon|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnu-post/index.html"&gt;
     &lt;img src="/graphics/icons/GNU-Post-2007.80.png"
          alt="&nbsp;[GNU Post seal]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU Post images&lt;br /&gt;
     &lt;small&gt;by Tomasz W. 
Koz&#322;owski&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|)$/
-               && $TYPE  = /^(button|cartoon|icon|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = 
/^((gnu|tux|),(button|cartoon|icon|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a 
href="/graphics/gnu-and-freedo/gnu-and-freedo.html"&gt;
     &lt;img src="/graphics/icons/freedo-logo.80.png"
          alt="&nbsp;[Freedo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU and Freedo&lt;br /&gt;
     &lt;small&gt;by Jos&eacute; Miguel Silva Lara and M&aacute;rcio Alexandre
     Silva Delgado&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|)$/
-               && $TYPE  = /^(poster|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/umsa/umsa.html"&gt;
     &lt;img src="/graphics/icons/gnu-tux.80.png"
          alt="&nbsp;[Tux riding a strong GNU]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
@@ -1005,40 +949,34 @@
 &lt;/table&gt;
 
 &lt;h4 id="collections"&gt;Collections&lt;/h4&gt;
-&lt;table&gt;
+&lt;table class="gnu-art"&gt;
 &lt;tr style="display:none"&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!-- Dummy 
entry for xhtml validation.
---&gt;&lt;!--#if expr="$THEME = /^$/
-               && $TYPE  = /^(icon|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^(,(icon|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/avatars.html"&gt;
     &lt;img src="/graphics/icons/avatar-3d-baby-gnu.80.png"
          alt="&nbsp;[An avatar based on Georg Bahlon's 3D GNU head]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Avatars&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/gnome-asia-2019-logo-compet.html"&gt;
     &lt;img src="/graphics/icons/gnome-asia-2019-logo.80.png"
          alt="&nbsp;[Winner of the GNOME.Asia 2019 Logo Competition]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNOME.Asia 2019 Logo 
Competition&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|gnu|emacs|fs|)$/
-               && $TYPE  = /^(banner|button|plastic|poster|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|emacs|fs|),(banner|button|plastic|poster|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/historic-gnu-press.html"&gt;
     &lt;img src="/graphics/icons/Happy-back.80.png"
          alt="&nbsp;[Emacs logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Historic GNU press items&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(license|)$/
-               && $TYPE  = /^(logo|svg|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((license|),(logo|svg|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/license-logos.html"&gt;
     &lt;img src="/graphics/icons/gfdl-logo.80.png"
          alt="&nbsp;[GFDL logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU license logos&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/package-logos.html"&gt;
     &lt;img src="/graphics/icons/gnowsys-logo.80.png"
          alt="&nbsp;[gnowsys logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Logos of GNU packages&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|gnu|tux|emacs|fs|)$/
-               && $TYPE  = /^(wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|emacs|fs|),(wallpaper|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="/graphics/wallpapers.html"&gt;
     &lt;img src="/graphics/icons/gnu-alt-wp1.80.png"
          alt="&nbsp;[Alternative GNU wallpaper]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
@@ -1048,86 +986,98 @@
 
 &lt;h3 id="other-sites"&gt;GNU Art on other sites&lt;/h3&gt;
 
-&lt;table&gt;
-&lt;!-- RT #1297904 --&gt;
+&lt;table class="gnu-art"&gt;
 &lt;tr style="display:none"&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!-- Dummy 
entry for xhtml validation.
---&gt;&lt;!--#if expr="$THEME = /^(gnu|tux|rms|)$/
-               && $TYPE  = /^(cartoon|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
+&lt;!-- RT #1815855 --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a 
href="https://www.skamphausen.de/cgi-bin/ska/Brave_GNU_World_Logo"&gt;
+    &lt;img src="/graphics/icons/brave-gnu-world-logo.80.png"
+         alt="&nbsp;[Brave GNU World logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;Brave GNU World logo&lt;br /&gt;
+    &lt;small&gt;by Stefan 
Kamphausen&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
+&lt;!-- RT #1638315 --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="https://free-software-logo.codeberg.page/"&gt;
+    &lt;img src="/graphics/icons/fs-logo.80.png"
+         alt="&nbsp;[Free Software logo]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;Free Software logo&lt;br /&gt;
+    &lt;small&gt;by Robert 
Martinez&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|tux|rms|),(cartoon|))$/" --&gt;
+&lt;!-- RT #1297904 --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="https://librefan.eu.org/node/787"&gt;
     &lt;img src="/graphics/icons/pepper-and-carrot-24.80.png"
          alt="&nbsp;[Pepper &amp; Carrot]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;&lt;em&gt;Pepper &amp; Carrot&lt;/em&gt; episode 24 &ndash; a 
free software cartoon&lt;br /&gt;
     &lt;small&gt;by Librefan&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|emacs|)$/
-               && $TYPE  = /^(wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|emacs|),(wallpaper|))$/" --&gt;
 &lt;!-- RT #1242119 --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a 
href="https://goblinrefuge.com/mediagoblin/u/emacsomancer/m/my-god-it-s-full-of-car-s-png"&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a 
href="https://www.reddit.com/r/linuxmasterrace/comments/722nr9/my_god_its_full_of_cars/"&gt;
     &lt;img src="/graphics/icons/lisp-meditate.80.png"
          alt="&nbsp;[Meditating GNU with Lisp on background]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;My God, it's full of &lsquo;car&rsquo;s!&lt;br /&gt;
     &lt;small&gt;by Benjamin 
Slade&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|gnu|)$/
-               && $TYPE  = /^(badge|wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|gnu|),(badge|wallpaper|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="http://www.techtux.be/fsf/index.html"&gt;
     &lt;img src="/graphics/icons/want-to-be-gnu.80.png"
          alt="&nbsp;[GNU wallpaper]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;More GNU designs&lt;br /&gt;
     &lt;small&gt;by Ben &ldquo;Skwid&rdquo; 
Gailly&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(fs|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a <span 
class="removed"><del><strong>href="http://www.davidam.com/art/free-software/free-software-art.tar.gz"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="http://web-old.archive.org/web/*/http://www.davidam.com/art/free-software/free-software-art.tar.gz"&gt;</em></ins></span>
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a 
href="http://web-old.archive.org/web/*/http://www.davidam.com/art/free-software/free-software-art.tar.gz"&gt;
     &lt;img src="/graphics/icons/fsf-cuaderno.80.png"
          alt="&nbsp;[FSF art]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Free software art&lt;br /&gt;
     &lt;small&gt;by David Arroyo 
Men&eacute;ndez&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|)$/
-               && $TYPE  = /^(poster|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a 
href="https://apolonis.deviantart.com/art/Le-Sage-285523519"&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|),(poster|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a 
href="https://www.deviantart.com/apolonis/art/Le-Sage-285523519"&gt;
     &lt;img src="/graphics/icons/le-sage.80.png"
          alt="&nbsp;['United Geekdom of GNU Linux' poster]&nbsp;" 
/&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Le Sage&lt;br /&gt;
     &lt;small&gt;by Apolonis&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnu|fs|)$/
-               && $TYPE  = /^(banner|logo|poster|)$/" --&gt;
-&lt;tr&gt;&lt;td&gt;&lt;a href="http://gnuart.onshore.com"&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnu|fs|),(banner|logo|poster|))$/" 
--&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a 
href="https://web.archive.org/web/20210116144718/http://gnuart.onshore.com/"&gt;
     &lt;img src="/graphics/icons/gsam-want-gnu.80.png"
          alt="&nbsp;['I want GNU' poster]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU art&lt;br /&gt;
     &lt;small&gt;by Raul Silva&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(license$|)$/
-               && $TYPE  = /^(logo|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((license|),(logo|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a 
href="https://lispmachine.wordpress.com/category/art/"&gt;
     &lt;img src="/graphics/icons/copyleft-hebrew.80.png"
          alt="&nbsp;[Hebrew copyleft sign]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Various logos&lt;br /&gt;
     &lt;small&gt;by Arnuld 
Uttre&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|tux|fs|)$/
-               && $TYPE  = /^(button|wallpaper|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = 
/^((gnuhead|tux|fs|),(button|wallpaper|))$/" --&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a href="http://www.gerwinski.de/~anja/gnuart/"&gt;
     &lt;img src="/graphics/icons/europa-and-gnu.80.png"
          alt="&nbsp;[GNU and Europa]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;GNU themed artwork&lt;br /&gt;
     &lt;small&gt;by Anja and Markus 
Gerwinski&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
---&gt;&lt;!--#if expr="$THEME = /^(gnuhead|gnu|)$/
-               && $TYPE  = /^(button|icon|)$/" --&gt;
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((gnuhead|gnu|),(button|icon|))$/" 
--&gt;
 &lt;tr&gt;&lt;td&gt;&lt;a 
href="https://web.archive.org/web/20110513011151/http://graphics.rootmode.com/"&gt;
     &lt;img src="/graphics/icons/button-powered-by-gnu.80.png"
          alt="&nbsp;['Powered by GNU' button]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
     &lt;td&gt;Favicon and buttons &lt;small&gt;(archived)&lt;br /&gt;
     by Edward Alfert&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|),(button|cartoon|icon|banner|poster|svg|))$/" --&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a href="https://openclipart.org/search/?query=gnu"&gt;
+    &lt;img src="/graphics/icons/gnu-wizard.80.png"
+         alt="&nbsp;[GNU as wizard]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;GNU-related public-domain graphics&lt;br /&gt;
+    &lt;small&gt;at 
openclipart.org&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
+--&gt;&lt;!--#if expr="$THEME,$TYPE = /^((rms|),(icon|poster|wallpaper|))$/" 
--&gt;
+&lt;tr&gt;&lt;td&gt;&lt;a 
href="https://openclipart.org/search/?query=stallman"&gt;
+    &lt;img src="/graphics/icons/stallman-head.80.png"
+         alt="&nbsp;[Stallman head]&nbsp;" /&gt;&lt;/a&gt;&lt;/td&gt;
+    &lt;td&gt;Stallman-related public-domain graphics&lt;br /&gt;
+    &lt;small&gt;at 
openclipart.org&lt;/small&gt;&lt;/td&gt;&lt;/tr&gt;&lt;!--#endif
 --&gt;
 &lt;/table&gt;
 
 &lt;p class="button"&gt;&lt;a href="#select"&gt;Back to selection 
form&lt;/a&gt;&lt;/p&gt;
-&lt;!-- RT #902381 --&gt;
-&lt;!-- 2019-06-23 - offline since May 3rd.
-&lt;p id="openclipart"&gt;You can also find GNU-related public domain graphics 
at
-&lt;a 
href="https://openclipart.org/search/?query=GNU"&gt;openclipart.org&lt;/a&gt;.&lt;/p&gt;
---&gt;
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div id="footer" role="contentinfo"&gt;
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -1145,13 +1095,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and contributing translations 
of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and contributing translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -1172,7 +1122,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996-2007, 2010, <span 
class="removed"><del><strong>2012-2019</strong></del></span> <span 
class="inserted"><ins><em>2012-2020</em></ins></span> Free Software Foundation, 
Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 1996-2007, 2010, 2012-2022 Free Software Foundation, 
Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -1182,7 +1132,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2020/03/23 14:32:01 $
+$Date: 2022/11/22 12:00:51 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]