Make mutt-nntp depend on mutt >= 1.5.21-5

[software/mutt-debian.git] / doc / makedoc.c

diff --git a/doc/makedoc.c b/doc/makedoc.c
index 07d3405019e7ffedff8a56af6583e0d1c8ed207e..51128095e962a189ba3c11f3fb8c42549edafad9 100644 (file)
--- a/doc/makedoc.c
+++ b/doc/makedoc.c
@@ -117,8 +117,8 @@ static void print_confline (const char *, int, const char *, FILE *);
 static void handle_confline (char *, FILE *);
 static void makedoc (FILE *, FILE *);
 static void pretty_default (char *, size_t, const char *, int);
-static int sgml_fputc (int, FILE *, int);
-static int sgml_fputs (const char *, FILE *, int);
+static int sgml_fputc (int, FILE *);
+static int sgml_fputs (const char *, FILE *);
 static int sgml_id_fputs (const char *, FILE *);
 
 int main (int argc, char *argv[])
@@ -591,14 +591,14 @@ static void sgml_print_strval (const char *v, FILE *out)
     if (*v <  ' ' || *v & 0x80)
     {
       char_to_escape (buff, (unsigned int) *v);
-      sgml_fputs (buff, out, 1);
+      sgml_fputs (buff, out);
       continue;
     }
-    sgml_fputc ((unsigned int) *v, out, 1);
+    sgml_fputc ((unsigned int) *v, out);
   }
 }
 
-static int sgml_fputc (int c, FILE *out, int full)
+static int sgml_fputc (int c, FILE *out)
 {
   switch (c)
   {
@@ -606,25 +606,14 @@ static int sgml_fputc (int c, FILE *out, int full)
     case '<': return fputs ("&lt;", out);
     case '>': return fputs ("&gt;", out);
     case '&': return fputs ("&amp;", out);
-    /* map to entities, fall-through to raw if !full */
-    case '$': if (full) return fputs ("&dollar;", out);
-    case '_': if (full) return fputs ("&lowbar;", out);
-    case '%': if (full) return fputs ("&percnt;", out);
-    case '\\': if (full) return fputs ("&bsol;", out);
-    case '"': if (full) return fputs ("&quot;", out);
-    case '[': if (full) return fputs ("&lsqb;", out);
-    case ']': if (full) return fputs ("&rsqb;", out);
-    case '~': if (full) return fputs ("&tilde;", out);
-    case '|': if (full) return fputs ("&verbar;", out);
-    case '^': if (full) return fputs ("&circ;", out);
     default:  return fputc (c, out);
   }
 }
 
-static int sgml_fputs (const char *s, FILE *out, int full)
+static int sgml_fputs (const char *s, FILE *out)
 {
   for (; *s; s++)
-    if (sgml_fputc ((unsigned int) *s, out, full) == EOF)
+    if (sgml_fputc ((unsigned int) *s, out) == EOF)
       return EOF;
 
   return 0;
@@ -716,7 +705,7 @@ static void print_confline (const char *varname, int type, const char *val, FILE
       fputs ("\n<sect2 id=\"", out);
       sgml_id_fputs(varname, out);
       fputs ("\">\n<title>", out);
-      sgml_fputs (varname, out, 1);
+      sgml_fputs (varname, out);
       fprintf (out, "</title>\n<literallayout>Type: %s", type2human (type));
 
       
@@ -1220,7 +1209,7 @@ static int print_it (int special, char *str, FILE *out, int docstat)
        case SP_STR:
        {
          if (docstat & D_TAB)
-           sgml_fputs (str, out, 0);
+           sgml_fputs (str, out);
          else
          {
            while (*str)
@@ -1238,7 +1227,7 @@ static int print_it (int special, char *str, FILE *out, int docstat)
                  str++;
                }
                else
-                 sgml_fputc (*str, out, 1);
+                 sgml_fputc (*str, out);
              }
            }
          }
@@ -1271,8 +1260,8 @@ void print_ref (FILE *out, int output_dollar, const char *ref)
     sgml_id_fputs (ref, out);
     fputs ("\">", out);
     if (output_dollar)
-      fputs ("&dollar;", out);
-    sgml_fputs (ref, out, 1);
+      fputc ('$', out);
+    sgml_fputs (ref, out);
     fputs ("</link>", out);
     break;