From: Lee Date: Tue, 23 Oct 2018 03:00:43 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy X-Git-Tag: v_3_0_27~44 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=a648ec5cf9edeb4a447b408fe08c3c11c1c748fe;hp=2ee310708e72149a8adfb9cca3fbb0d3a067e604 Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy unable to do a push - allarently i have to pull first --- diff --git a/doc/source/ldp.dsl.in b/doc/source/ldp.dsl.in index ccbea7d1..fba0b1db 100644 --- a/doc/source/ldp.dsl.in +++ b/doc/source/ldp.dsl.in @@ -1,420 +1,420 @@ - - - -]]> - - -]]> -]> - - - - - - - - -;; ============================== -;; customize the print stylesheet -;; ============================== -;; -;; see http://docbook.sourceforge.net/projects/dsssl/doc/print.html -;; - -(define %indent-screen-lines% - ;; Indent lines in a 'Screen'? - #t) - -(define %callout-fancy-bug% - ;; Use fancy callout bugs? - #t) - -(define %chap-app-running-heads% - ;; Generate running headers and footers on chapter-level elements? - #t) - -(define %chap-app-running-head-autolabel% - ;; Put chapter labels in running heads? - #t) - -;; this is necessary because right now jadetex does not understand -;; symbolic entities, whereas things work well with numeric entities. -(declare-characteristic preserve-sdata? - "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" - #f) - -;; put the legal notice in a separate file -(define %generate-legalnotice-link% - #t) - -;; use graphics in admonitions, and have their path be "stylesheet-images" -;; NO: they do not yet look very good -(define %admon-graphics-path% - "./stylesheet-images/") - -(define %admon-graphics% - #f) - -(define %funcsynopsis-decoration% - ;; make funcsynopsis look pretty - #t) - -;;(define %shade-verbatim% -;; #t) - -(define %section-autolabel% #t) - ;; For enumerated sections (1.1, 1.1.1, 1.2, etc.) - -;; HB changed TOC depth to 3 levels. -(define (toc-depth nd) - 3) - -;; HB added 03/20/02, see dbparam.dsl ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define %body-attr% - ;; REFENTRY body-attr - ;; PURP What attributes should be hung off of BODY? - ;; DESC - ;; A list of the BODY attributes that should be generated. - ;; The format is a list of lists, each interior list contains the - ;; name and value of a BODY attribute. - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - (list - (list "BGCOLOR" "#EEEEEE") - (list "TEXT" "#000000") - (list "LINK" "#0000FF") - (list "VLINK" "#840084") - (list "ALINK" "#0000FF"))) - -(define %stylesheet% - ;; REFENTRY stylesheet - ;; PURP Name of the stylesheet to use - ;; DESC - ;; The name of the stylesheet to place in the HTML LINK TAG, or '#f' to - ;; suppress the stylesheet LINK. - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - "../p_doc.css") - -(define %stylesheet-type% - ;; REFENTRY stylesheet-type - ;; PURP The type of the stylesheet to use - ;; DESC - ;; The type of the stylesheet to place in the HTML LINK TAG. - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - "text/css") - -(define %css-liststyle-alist% - ;; REFENTRY css-liststyle-alist - ;; PURP Map DocBook OVERRIDE and MARK attributes to CSS - ;; DESC - ;; If '%css-decoration%' is turned on then the list-style-type property of - ;; list items will be set to reflect the list item style selected in the - ;; DocBook instance. This associative list maps the style type names used - ;; in your instance to the appropriate CSS names. If no mapping exists, - ;; the name from the instance will be used. - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - '(("bullet" "disc") - ("box" "square"))) - -(define %css-decoration% - ;; REFENTRY css-decoration - ;; PURP Enable CSS decoration of elements - ;; DESC - ;; If '%css-decoration%' is turned on then HTML elements produced by the - ;; stylesheet may be decorated with STYLE attributes. For example, the - ;; LI tags produced for list items may include a fragment of CSS in the - ;; STYLE attribute which sets the CSS property "list-style-type". - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - #t) - -;; swa1 - -(define %generate-part-toc% - #f) - -(define %generate-article-toc% - ;; Should a Table of Contents be produced for Articles? - ;; If true, a Table of Contents will be generated for each 'Article'. - #t) - -(define %generate-part-toc-on-titlepage% - ;; Should the Part TOC appear on the Part title page? - #f) - -;;Do you want a separate page for the title? -(define %generate-article-titlepage-on-separate-page% - #t) - -;;Do you want the article toc on the titlepage or separate? -(define %generate-article-toc-on-titlepage% - #f) - -;;Titlepage Separate? -;; This is the one that makes TOC only on first page!! hal. -(define (chunk-skip-first-element-list) - '()) - -(define %body-start-indent% - ;; Default indent of body text - 2pi) - -(define %para-indent-firstpara% - ;; First line start-indent for the first paragraph - 0pt) - -;; swa2 - -(define %para-indent% - ;; First line start-indent for paragraphs (other than the first) - 0pt) - -(define %block-start-indent% - ;; Extra start-indent for block-elements - 2pt) - -;;Define distance between paragraphs -(define %para-sep% - (/ %bf-size% 2.0)) - -;; with swa2 no effects - -;; swa3 - -;;Define distance between block elements (figures, tables, etc.). -(define %block-sep% - (* %para-sep% 1.0)) -;; (* %para-sep% 2.0)) - -(define %hyphenation% - ;; Allow automatic hyphenation? - #t) - -(define %left-margin% 5pi) -(define %right-margin% 5pi) -(define %top-margin% 5pi) -(define %bottom-margin% 5pi) -(define %footer-margin% 2pi) -(define %header-margin% 2pi) - -(define %line-spacing-factor% 1.3) - ;; Factor used to calculate leading - ;; The leading is calculated by multiplying the current font size by the - ;; '%line-spacing-factor%'. For example, if the font size is 10pt and - ;; the '%line-spacing-factor%' is 1.1, then the text will be - ;; printed "10-on-11". - -(define %head-before-factor% - ;; Factor used to calculate space above a title - ;; The space before a title is calculated by multiplying the font size - ;; used in the title by the '%head-before-factor%'. -;; 0.75) - 0.5) - -(define %head-after-factor% - ;; Factor used to calculate space below a title - ;; The space after a title is calculated by multiplying the font size used - ;; in the title by the '%head-after-factor%'. - 0.5) - -(define %input-whitespace-treatment% 'collapse) - -(define ($generate-article-lot-list$) - ;; Which Lists of Titles should be produced for Articles? - (list )) - - - - - - - - - - - -;; this is necessary because right now jadetex does not understand -;; symbolic entities, whereas things work well with numeric entities. -(declare-characteristic preserve-sdata? - "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" - #f) - -;; put the legal notice in a separate file -(define %generate-legalnotice-link% - #t) - -;; use graphics in admonitions, and have their path be "stylesheet-images" -;; NO: they do not yet look very good -(define %admon-graphics-path% - "./stylesheet-images/") - -(define %admon-graphics% - #f) - -(define %funcsynopsis-decoration% - ;; make funcsynopsis look pretty - #t) - -(define %html-ext% - ".html") - -(define %generate-article-toc% - ;; Should a Table of Contents be produced for Articles? - ;; If true, a Table of Contents will be generated for each 'Article'. - #t) - -;; HB added next three statements 05/03/02. -;;Do you want a separate page for the title? -(define %generate-article-titlepage-on-separate-page% - #t) - -;;Do you want the article toc on the titlepage or separate? -(define %generate-article-toc-on-titlepage% - #t) - -;;Titlepage Separate? -;; This is the one that makes TOC only on first page!! hal. -(define (chunk-skip-first-element-list) - '()) - -(define %root-filename% - ;; The filename of the root HTML document (e.g, "index"). - "index") - -(define %generate-part-toc% - #t) - -(define %shade-verbatim% - #t) - -(define %use-id-as-filename% - ;; Use ID attributes as name for component HTML files? - #t) - -(define %graphic-default-extension% - "gif") - -(define %section-autolabel% #t) - ;; For enumerated sections (1.1, 1.1.1, 1.2, etc.) - -;; HB changed TOC depth to 3 levels. -(define (toc-depth nd) - 3) - -;; HB added 03/20/02, see dbparam.dsl ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define %body-attr% - ;; REFENTRY body-attr - ;; PURP What attributes should be hung off of BODY? - ;; DESC - ;; A list of the the BODY attributes that should be generated. - ;; The format is a list of lists, each interior list contains the - ;; name and value of a BODY attribute. - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - (list - (list "BGCOLOR" "#EEEEEE") - (list "TEXT" "#000000") - (list "LINK" "#0000FF") - (list "VLINK" "#840084") - (list "ALINK" "#0000FF"))) - -(define %stylesheet% - ;; REFENTRY stylesheet - ;; PURP Name of the stylesheet to use - ;; DESC - ;; The name of the stylesheet to place in the HTML LINK TAG, or '#f' to - ;; suppress the stylesheet LINK. - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - "../p_doc.css") - -(define %stylesheet-type% - ;; REFENTRY stylesheet-type - ;; PURP The type of the stylesheet to use - ;; DESC - ;; The type of the stylesheet to place in the HTML LINK TAG. - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - "text/css") - -(define %css-liststyle-alist% - ;; REFENTRY css-liststyle-alist - ;; PURP Map DocBook OVERRIDE and MARK attributes to CSS - ;; DESC - ;; If '%css-decoration%' is turned on then the list-style-type property of - ;; list items will be set to reflect the list item style selected in the - ;; DocBook instance. This associative list maps the style type names used - ;; in your instance to the appropriate CSS names. If no mapping exists, - ;; the name from the instance will be used. - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - '(("bullet" "disc") - ("box" "square"))) - -(define %css-decoration% - ;; REFENTRY css-decoration - ;; PURP Enable CSS decoration of elements - ;; DESC - ;; If '%css-decoration%' is turned on then HTML elements produced by the - ;; stylesheet may be decorated with STYLE attributes. For example, the - ;; LI tags produced for list items may include a fragment of CSS in the - ;; STYLE attribute which sets the CSS property "list-style-type". - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - #t) - -;; HB added 2008-01-19 -(define %html-header-tags% - '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; -charset=ISO-8859-1")))) - - - - - - - - -;; =================================================== -;; Vairant without TOC for the Homepage --oes 24/05/02 -;; =================================================== - -(define %generate-article-toc% - ;; Should a Table of Contents be produced for Articles? - ;; If true, a Table of Contents will be generated for each 'Article'. - #f) - - - - - - - + + + +]]> + + +]]> +]> + + + + + + + + +;; ============================== +;; customize the print stylesheet +;; ============================== +;; +;; see http://docbook.sourceforge.net/projects/dsssl/doc/print.html +;; + +(define %indent-screen-lines% + ;; Indent lines in a 'Screen'? + #t) + +(define %callout-fancy-bug% + ;; Use fancy callout bugs? + #t) + +(define %chap-app-running-heads% + ;; Generate running headers and footers on chapter-level elements? + #t) + +(define %chap-app-running-head-autolabel% + ;; Put chapter labels in running heads? + #t) + +;; this is necessary because right now jadetex does not understand +;; symbolic entities, whereas things work well with numeric entities. +(declare-characteristic preserve-sdata? + "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" + #f) + +;; put the legal notice in a separate file +(define %generate-legalnotice-link% + #t) + +;; use graphics in admonitions, and have their path be "stylesheet-images" +;; NO: they do not yet look very good +(define %admon-graphics-path% + "./stylesheet-images/") + +(define %admon-graphics% + #f) + +(define %funcsynopsis-decoration% + ;; make funcsynopsis look pretty + #t) + +;;(define %shade-verbatim% +;; #t) + +(define %section-autolabel% #t) + ;; For enumerated sections (1.1, 1.1.1, 1.2, etc.) + +;; HB changed TOC depth to 3 levels. +(define (toc-depth nd) + 3) + +;; HB added 03/20/02, see dbparam.dsl ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define %body-attr% + ;; REFENTRY body-attr + ;; PURP What attributes should be hung off of BODY? + ;; DESC + ;; A list of the BODY attributes that should be generated. + ;; The format is a list of lists, each interior list contains the + ;; name and value of a BODY attribute. + ;; /DESC + ;; AUTHOR N/A + ;; /REFENTRY + (list + (list "BGCOLOR" "#EEEEEE") + (list "TEXT" "#000000") + (list "LINK" "#0000FF") + (list "VLINK" "#840084") + (list "ALINK" "#0000FF"))) + +(define %stylesheet% + ;; REFENTRY stylesheet + ;; PURP Name of the stylesheet to use + ;; DESC + ;; The name of the stylesheet to place in the HTML LINK TAG, or '#f' to + ;; suppress the stylesheet LINK. + ;; /DESC + ;; AUTHOR N/A + ;; /REFENTRY + "../p_doc.css") + +(define %stylesheet-type% + ;; REFENTRY stylesheet-type + ;; PURP The type of the stylesheet to use + ;; DESC + ;; The type of the stylesheet to place in the HTML LINK TAG. + ;; /DESC + ;; AUTHOR N/A + ;; /REFENTRY + "text/css") + +(define %css-liststyle-alist% + ;; REFENTRY css-liststyle-alist + ;; PURP Map DocBook OVERRIDE and MARK attributes to CSS + ;; DESC + ;; If '%css-decoration%' is turned on then the list-style-type property of + ;; list items will be set to reflect the list item style selected in the + ;; DocBook instance. This associative list maps the style type names used + ;; in your instance to the appropriate CSS names. If no mapping exists, + ;; the name from the instance will be used. + ;; /DESC + ;; AUTHOR N/A + ;; /REFENTRY + '(("bullet" "disc") + ("box" "square"))) + +(define %css-decoration% + ;; REFENTRY css-decoration + ;; PURP Enable CSS decoration of elements + ;; DESC + ;; If '%css-decoration%' is turned on then HTML elements produced by the + ;; stylesheet may be decorated with STYLE attributes. For example, the + ;; LI tags produced for list items may include a fragment of CSS in the + ;; STYLE attribute which sets the CSS property "list-style-type". + ;; /DESC + ;; AUTHOR N/A + ;; /REFENTRY + #t) + +;; swa1 + +(define %generate-part-toc% + #f) + +(define %generate-article-toc% + ;; Should a Table of Contents be produced for Articles? + ;; If true, a Table of Contents will be generated for each 'Article'. + #t) + +(define %generate-part-toc-on-titlepage% + ;; Should the Part TOC appear on the Part title page? + #f) + +;;Do you want a separate page for the title? +(define %generate-article-titlepage-on-separate-page% + #t) + +;;Do you want the article toc on the titlepage or separate? +(define %generate-article-toc-on-titlepage% + #f) + +;;Titlepage Separate? +;; This is the one that makes TOC only on first page!! hal. +(define (chunk-skip-first-element-list) + '()) + +(define %body-start-indent% + ;; Default indent of body text + 2pi) + +(define %para-indent-firstpara% + ;; First line start-indent for the first paragraph + 0pt) + +;; swa2 + +(define %para-indent% + ;; First line start-indent for paragraphs (other than the first) + 0pt) + +(define %block-start-indent% + ;; Extra start-indent for block-elements + 2pt) + +;;Define distance between paragraphs +(define %para-sep% + (/ %bf-size% 2.0)) + +;; with swa2 no effects + +;; swa3 + +;;Define distance between block elements (figures, tables, etc.). +(define %block-sep% + (* %para-sep% 1.0)) +;; (* %para-sep% 2.0)) + +(define %hyphenation% + ;; Allow automatic hyphenation? + #t) + +(define %left-margin% 5pi) +(define %right-margin% 5pi) +(define %top-margin% 5pi) +(define %bottom-margin% 5pi) +(define %footer-margin% 2pi) +(define %header-margin% 2pi) + +(define %line-spacing-factor% 1.3) + ;; Factor used to calculate leading + ;; The leading is calculated by multiplying the current font size by the + ;; '%line-spacing-factor%'. For example, if the font size is 10pt and + ;; the '%line-spacing-factor%' is 1.1, then the text will be + ;; printed "10-on-11". + +(define %head-before-factor% + ;; Factor used to calculate space above a title + ;; The space before a title is calculated by multiplying the font size + ;; used in the title by the '%head-before-factor%'. +;; 0.75) + 0.5) + +(define %head-after-factor% + ;; Factor used to calculate space below a title + ;; The space after a title is calculated by multiplying the font size used + ;; in the title by the '%head-after-factor%'. + 0.5) + +(define %input-whitespace-treatment% 'collapse) + +(define ($generate-article-lot-list$) + ;; Which Lists of Titles should be produced for Articles? + (list )) + + + + + + + + + + + +;; this is necessary because right now jadetex does not understand +;; symbolic entities, whereas things work well with numeric entities. +(declare-characteristic preserve-sdata? + "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" + #f) + +;; put the legal notice in a separate file +(define %generate-legalnotice-link% + #t) + +;; use graphics in admonitions, and have their path be "stylesheet-images" +;; NO: they do not yet look very good +(define %admon-graphics-path% + "./stylesheet-images/") + +(define %admon-graphics% + #f) + +(define %funcsynopsis-decoration% + ;; make funcsynopsis look pretty + #t) + +(define %html-ext% + ".html") + +(define %generate-article-toc% + ;; Should a Table of Contents be produced for Articles? + ;; If true, a Table of Contents will be generated for each 'Article'. + #t) + +;; HB added next three statements 05/03/02. +;;Do you want a separate page for the title? +(define %generate-article-titlepage-on-separate-page% + #t) + +;;Do you want the article toc on the titlepage or separate? +(define %generate-article-toc-on-titlepage% + #t) + +;;Titlepage Separate? +;; This is the one that makes TOC only on first page!! hal. +(define (chunk-skip-first-element-list) + '()) + +(define %root-filename% + ;; The filename of the root HTML document (e.g, "index"). + "index") + +(define %generate-part-toc% + #t) + +(define %shade-verbatim% + #t) + +(define %use-id-as-filename% + ;; Use ID attributes as name for component HTML files? + #t) + +(define %graphic-default-extension% + "gif") + +(define %section-autolabel% #t) + ;; For enumerated sections (1.1, 1.1.1, 1.2, etc.) + +;; HB changed TOC depth to 3 levels. +(define (toc-depth nd) + 3) + +;; HB added 03/20/02, see dbparam.dsl ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define %body-attr% + ;; REFENTRY body-attr + ;; PURP What attributes should be hung off of BODY? + ;; DESC + ;; A list of the the BODY attributes that should be generated. + ;; The format is a list of lists, each interior list contains the + ;; name and value of a BODY attribute. + ;; /DESC + ;; AUTHOR N/A + ;; /REFENTRY + (list + (list "BGCOLOR" "#EEEEEE") + (list "TEXT" "#000000") + (list "LINK" "#0000FF") + (list "VLINK" "#840084") + (list "ALINK" "#0000FF"))) + +(define %stylesheet% + ;; REFENTRY stylesheet + ;; PURP Name of the stylesheet to use + ;; DESC + ;; The name of the stylesheet to place in the HTML LINK TAG, or '#f' to + ;; suppress the stylesheet LINK. + ;; /DESC + ;; AUTHOR N/A + ;; /REFENTRY + "../p_doc.css") + +(define %stylesheet-type% + ;; REFENTRY stylesheet-type + ;; PURP The type of the stylesheet to use + ;; DESC + ;; The type of the stylesheet to place in the HTML LINK TAG. + ;; /DESC + ;; AUTHOR N/A + ;; /REFENTRY + "text/css") + +(define %css-liststyle-alist% + ;; REFENTRY css-liststyle-alist + ;; PURP Map DocBook OVERRIDE and MARK attributes to CSS + ;; DESC + ;; If '%css-decoration%' is turned on then the list-style-type property of + ;; list items will be set to reflect the list item style selected in the + ;; DocBook instance. This associative list maps the style type names used + ;; in your instance to the appropriate CSS names. If no mapping exists, + ;; the name from the instance will be used. + ;; /DESC + ;; AUTHOR N/A + ;; /REFENTRY + '(("bullet" "disc") + ("box" "square"))) + +(define %css-decoration% + ;; REFENTRY css-decoration + ;; PURP Enable CSS decoration of elements + ;; DESC + ;; If '%css-decoration%' is turned on then HTML elements produced by the + ;; stylesheet may be decorated with STYLE attributes. For example, the + ;; LI tags produced for list items may include a fragment of CSS in the + ;; STYLE attribute which sets the CSS property "list-style-type". + ;; /DESC + ;; AUTHOR N/A + ;; /REFENTRY + #t) + +;; HB added 2008-01-19 +(define %html-header-tags% + '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; +charset=ISO-8859-1")))) + + + + + + + + +;; =================================================== +;; Vairant without TOC for the Homepage --oes 24/05/02 +;; =================================================== + +(define %generate-article-toc% + ;; Should a Table of Contents be produced for Articles? + ;; If true, a Table of Contents will be generated for each 'Article'. + #f) + + + + + + +