Merge fixes from CUPS 1.4.0 (r8739).

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1586 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 3a4064985acaec769cc088ee6dbe013be25ab3ef..7704d0ab3f9fce10cda5967a2dd914a9ba0dfcf5 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,11 @@
-CHANGES.txt - 2009-06-26
+CHANGES.txt - 2009-07-01
 ------------------------
 
 CHANGES IN CUPS V1.4.0
 
        - Localization updates (STR #3223)
        - Documentation updates (STR #3225, STR #3230)
+       - The web interface didn't show the default options (STR #3244)
        - The IPP and LPD backends needed print data before they would do an
          SNMP query.
        - Fixed a GNU TLS compatibility issue (STR #3231)

diff --git a/CREDITS.txt b/CREDITS.txt
index c7dbdfad3b0aee4a82d793c0521c78a1dd91d833..2fefcb458976112eef81840c3e59690c304d3b8d 100644 (file)
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -1,4 +1,4 @@
-CREDITS.txt - 2008-12-08
+CREDITS.txt - 2009-07-01
 ------------------------
 
 Few projects are completed by one person, and CUPS is no exception.  We'd
@@ -28,6 +28,7 @@ like to thank the following individuals for their contributions:
     Jason McMullan                 - Original CUPS RPM distributions.
     Wes Morgan                     - *BSD fixes.
     Daniel Nylander                - Swedish localization.
+    Niklas 'Nille' \81kerstr\9am       - Swedish localization.
     Giulio Orsero                  - Bug fixes and testing.
     Michal Osowiecki               - Polish localization.
     Citra Paska                    - Indonesian localization.

diff --git a/Makefile b/Makefile
index e1929711cc1a7ad8951b773868f0847f83d7c553..586c9e6cd48196a53447bf600015919e688f5fb8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -392,6 +392,7 @@ docset:     apihelp
        echo Indexing docset...
        /Developer/usr/bin/docsetutil index org.cups.docset
        echo Generating docset archive and feed...
+       $(RM) org.cups.docset.atom
        /Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
                --atom org.cups.docset.atom \
                --download-url http://www.cups.org/org.cups.docset.xar \

diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index 7bc37f75cb18f2aefafe4cfd4f96f036ae2e5c7f..21c8edec53b53fc6998fb5a9ff18d3dc6a252ba4 100644 (file)
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -1165,7 +1165,7 @@ static Boolean list_device_cb(void *refcon,
        snprintf(optionsstr, sizeof(optionsstr), "?location=%x", (unsigned)deviceLocation);
 
       httpAssembleURI(HTTP_URI_CODING_ALL, uristr, sizeof(uristr), "usb", NULL, makestr, 0, modelstr);
-      strncat(uristr, optionsstr, sizeof(uristr));
+      strlcat(uristr, optionsstr, sizeof(uristr));
 
       cupsBackendReport("direct", uristr, make_modelstr, make_modelstr, idstr,
                         NULL);

diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c
index 501b1f4996cfd8154a5dbf8941b760593cb595a4..7d90c807326aeedd8acaf05489033f7ed4168a5d 100644 (file)
--- a/cgi-bin/makedocset.c
+++ b/cgi-bin/makedocset.c
@@ -357,7 +357,7 @@ write_index(const char   *path,             /* I - File to write */
 
 static void
 write_info(const char *path,           /* I - File to write */
-           const char *revision)       /* I - Version number */
+           const char *revision)       /* I - Subversion revision number */
 {
   cups_file_t  *fp;                    /* File */
 
@@ -379,14 +379,22 @@ write_info(const char *path,              /* I - File to write */
                     "\t<key>CFBundleName</key>\n"
                     "\t<string>CUPS Documentation</string>\n"
                     "\t<key>CFBundleVersion</key>\n"
-                    "\t<string>1.4.%s</string>\n"
+                    "\t<string>%d.%d.%s</string>\n"
+                    "\t<key>CFBundleShortVersionString</key>\n"
+                    "\t<string>%d.%d.%d</string>\n"
                     "\t<key>DocSetFeedName</key>\n"
                     "\t<string>cups.org</string>\n"
                     "\t<key>DocSetFeedURL</key>\n"
-                    "\t<string>http://www.cups.org/org.cups.docset.xar"
+                    "\t<string>http://www.cups.org/org.cups.docset.atom"
                     "</string>\n"
+                    "\t<key>DocSetPublisherIdentifier</key>\n"
+                    "\t<string>org.cups</string>\n"
+                    "\t<key>DocSetPublisherName</key>\n"
+                    "\t<string>CUPS</string>\n"
                     "</dict>\n"
-                    "</plist>\n", revision);
+                    "</plist>\n",
+                    CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, revision,
+                    CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH);
 
   cupsFileClose(fp);
 }

diff --git a/cups/http.c b/cups/http.c
index a607581a4d8991b18378a4a1c10754f1512374b2..f2f37a731db55c0eefb64ce67041cc8bba24960b 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -3004,6 +3004,11 @@ http_setup_ssl(http_t *http)             /* I - Connection to server */
     http->error  = errno;
     http->status = HTTP_ERROR;
 
+    gnutls_deinit(conn->session);
+    gnutls_certificate_free_credentials(*credentials);
+    free(credentials);
+    free(conn);
+
     return (-1);
   }
 
@@ -3138,6 +3143,13 @@ http_upgrade(http_t *http)               /* I - Connection to server */
 
   DEBUG_printf(("7http_upgrade(%p)", http));
 
+ /*
+  * Flush the connection to make sure any previous "Upgrade" message
+  * has been read.
+  */
+
+  httpFlush(http);
+
  /*
   * Copy the HTTP data to a local variable so we can do the OPTIONS
   * request without interfering with the existing request data...
@@ -3165,8 +3177,6 @@ http_upgrade(http_t *http)                /* I - Connection to server */
     while (httpUpdate(http) == HTTP_CONTINUE);
   }
 
-  httpFlush(http);
-
  /*
   * Restore the HTTP request data...
   */

diff --git a/desktop/cups.desktop.in b/desktop/cups.desktop.in
index 4609b737bfdad62d841ca16564e1654c8a8972b9..947a6852dfccf6a671cfe7f28bee03984385a397 100644 (file)
--- a/desktop/cups.desktop.in
+++ b/desktop/cups.desktop.in
@@ -29,6 +29,8 @@ Name[pl.UTF-8]=Zarządzanie drukowaniem
 Comment[pl.UTF-8]=Interfejs WWW CUPS
 Name[ru.UTF-8]=Настройка печати
 Comment[ru.UTF-8]=Настройка CUPS
+Name[sv.UTF-8]=Hantera skrivare
+Comment[sv.UTF-8]=CUPS webb-gränssnitt
 Name[zh.UTF-8]=打印机管理
 Comment[zh.UTF-8]=CUPS网页界面
 Name[zh_TW.UTF-8]=印表管理

diff --git a/templates/de/option-boolean.tmpl b/templates/de/option-boolean.tmpl
index 2d0dd551a1dc5f7e0353c834575c8e9e4a642d54..1b352bb1ffe11e3b8593bc42ff32c80999605725 100644 (file)
--- a/templates/de/option-boolean.tmpl
+++ b/templates/de/option-boolean.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>

diff --git a/templates/de/option-pickmany.tmpl b/templates/de/option-pickmany.tmpl
index 067075aec0eaebb3b32e54b7121c370376c4bcfb..0da75e5d2c88086015907bee2864a2bfaa5938bb 100644 (file)
--- a/templates/de/option-pickmany.tmpl
+++ b/templates/de/option-pickmany.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>

diff --git a/templates/de/option-pickone.tmpl b/templates/de/option-pickone.tmpl
index e467d5fd57e560bec51328b6d5a23184b6e7dbf8..c88fe059936ba36902902fafe51c11862b601568 100644 (file)
--- a/templates/de/option-pickone.tmpl
+++ b/templates/de/option-pickone.tmpl
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>

diff --git a/templates/es/option-boolean.tmpl b/templates/es/option-boolean.tmpl
index 2d0dd551a1dc5f7e0353c834575c8e9e4a642d54..1b352bb1ffe11e3b8593bc42ff32c80999605725 100644 (file)
--- a/templates/es/option-boolean.tmpl
+++ b/templates/es/option-boolean.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>

diff --git a/templates/es/option-pickmany.tmpl b/templates/es/option-pickmany.tmpl
index 067075aec0eaebb3b32e54b7121c370376c4bcfb..0da75e5d2c88086015907bee2864a2bfaa5938bb 100644 (file)
--- a/templates/es/option-pickmany.tmpl
+++ b/templates/es/option-pickmany.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>

diff --git a/templates/es/option-pickone.tmpl b/templates/es/option-pickone.tmpl
index 618ee9d99e5b74cbf20ac1a62af86be61ffa26f0..8690af0545d480e149345c3ecc8921788a1c222c 100644 (file)
--- a/templates/es/option-pickone.tmpl
+++ b/templates/es/option-pickone.tmpl
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>

diff --git a/templates/ja/option-boolean.tmpl b/templates/ja/option-boolean.tmpl
index 2d0dd551a1dc5f7e0353c834575c8e9e4a642d54..1b352bb1ffe11e3b8593bc42ff32c80999605725 100644 (file)
--- a/templates/ja/option-boolean.tmpl
+++ b/templates/ja/option-boolean.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>

diff --git a/templates/ja/option-pickmany.tmpl b/templates/ja/option-pickmany.tmpl
index 067075aec0eaebb3b32e54b7121c370376c4bcfb..0da75e5d2c88086015907bee2864a2bfaa5938bb 100644 (file)
--- a/templates/ja/option-pickmany.tmpl
+++ b/templates/ja/option-pickmany.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>

diff --git a/templates/ja/option-pickone.tmpl b/templates/ja/option-pickone.tmpl
index 8b0a60d0f9749408a7ec8a9e5ade06cc7a2625bf..e927e7ca88cfa0d5f98cee8f278498fe08f4cfc6 100644 (file)
--- a/templates/ja/option-pickone.tmpl
+++ b/templates/ja/option-pickone.tmpl
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>

diff --git a/templates/option-boolean.tmpl b/templates/option-boolean.tmpl
index 2d0dd551a1dc5f7e0353c834575c8e9e4a642d54..1b352bb1ffe11e3b8593bc42ff32c80999605725 100644 (file)
--- a/templates/option-boolean.tmpl
+++ b/templates/option-boolean.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>

diff --git a/templates/option-pickmany.tmpl b/templates/option-pickmany.tmpl
index 067075aec0eaebb3b32e54b7121c370376c4bcfb..0da75e5d2c88086015907bee2864a2bfaa5938bb 100644 (file)
--- a/templates/option-pickmany.tmpl
+++ b/templates/option-pickmany.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>

diff --git a/templates/option-pickone.tmpl b/templates/option-pickone.tmpl
index 05b83ee8a7122be7685bffafb7e7697e9bd3897b..5030c46379812f72b5a98ca0984d7574e6a98082 100644 (file)
--- a/templates/option-pickone.tmpl
+++ b/templates/option-pickone.tmpl
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>

diff --git a/templates/pl/option-boolean.tmpl b/templates/pl/option-boolean.tmpl
index 2d0dd551a1dc5f7e0353c834575c8e9e4a642d54..1b352bb1ffe11e3b8593bc42ff32c80999605725 100644 (file)
--- a/templates/pl/option-boolean.tmpl
+++ b/templates/pl/option-boolean.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>

diff --git a/templates/pl/option-pickmany.tmpl b/templates/pl/option-pickmany.tmpl
index 067075aec0eaebb3b32e54b7121c370376c4bcfb..0da75e5d2c88086015907bee2864a2bfaa5938bb 100644 (file)
--- a/templates/pl/option-pickmany.tmpl
+++ b/templates/pl/option-pickmany.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>

diff --git a/templates/pl/option-pickone.tmpl b/templates/pl/option-pickone.tmpl
index 93100729cba258732f3f29c118bc21d656f58bfd..db40015ea902639a649bbc6ba436db71917bd29f 100644 (file)
--- a/templates/pl/option-pickone.tmpl
+++ b/templates/pl/option-pickone.tmpl
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>

diff --git a/templates/ru/option-boolean.tmpl b/templates/ru/option-boolean.tmpl
index 2d0dd551a1dc5f7e0353c834575c8e9e4a642d54..1b352bb1ffe11e3b8593bc42ff32c80999605725 100644 (file)
--- a/templates/ru/option-boolean.tmpl
+++ b/templates/ru/option-boolean.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>

diff --git a/templates/ru/option-pickmany.tmpl b/templates/ru/option-pickmany.tmpl
index 067075aec0eaebb3b32e54b7121c370376c4bcfb..0da75e5d2c88086015907bee2864a2bfaa5938bb 100644 (file)
--- a/templates/ru/option-pickmany.tmpl
+++ b/templates/ru/option-pickmany.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>

diff --git a/templates/ru/option-pickone.tmpl b/templates/ru/option-pickone.tmpl
index b511ec9460b8d39df07b518402cb66da63813657..f2dbb5eb796ab9eed7d8bc5c1876d394c138b6a2 100644 (file)
--- a/templates/ru/option-pickone.tmpl
+++ b/templates/ru/option-pickone.tmpl
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>