Changeset 428


Ignore:
Timestamp:
Nov 22, 2008, 11:02:04 AM (11 years ago)
Author:
julian.reschke@…
Message:

ABNF appendix: group by first letter, add internal links to definitions -- fix group detection (related to #36)

Location:
draft-ietf-httpbis/latest
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest/abnf2xml2rfc.xslt

    r427 r428  
    2424          <xsl:variable name="lineno" select="position()"/>
    2525          <xsl:variable name="sc1" select="substring(.,1,1)"/>
    26           <xsl:variable name="sc0" select="substring($lines[$lineno - 1],1,1)"/>
     26          <xsl:variable name="sc0" select="x:laststartchar($lines, $lineno - 1)"/>
    2727          <xsl:if test="$sc1!=' ' and $sc0!=' ' and $sc1!=$sc0">
    2828            <xsl:text>&#10;</xsl:text>
     
    6161  </xsl:if>
    6262</xsl:template>
     63
     64<xsl:function name="x:laststartchar">
     65  <xsl:param name="lines"/>
     66  <xsl:param name="position"/>
     67 
     68  <xsl:choose>
     69    <xsl:when test="' '!=substring($lines[$position],1,1)">
     70      <xsl:value-of select="substring($lines[$position],1,1)"/>
     71    </xsl:when>
     72    <xsl:otherwise>
     73      <xsl:value-of select="x:laststartchar($lines, $position - 1)"/>
     74    </xsl:otherwise>
     75  </xsl:choose>
     76</xsl:function>
    6377 
    6478 
  • draft-ietf-httpbis/latest/p1-messaging.html

    r427 r428  
    26602660<a href="#response" class="smpl">Response</a> = Status-Line *( ( general-header / response-header /
    26612661 entity-header ) CRLF ) CRLF [ message-body ]
     2662
    26622663<a href="#status.code.and.reason.phrase" class="smpl">Status-Code</a> = 3DIGIT
    26632664<a href="#status-line" class="smpl">Status-Line</a> = HTTP-Version SP Status-Code SP Reason-Phrase CRLF
     
    26702671<a href="#header.transfer-encoding" class="smpl">Transfer-Encoding-v</a> = *( "," OWS ) transfer-coding *( OWS "," [ OWS
    26712672 transfer-coding ] )
     2673
    26722674<a href="#uri" class="smpl">URI</a> = &lt;URI, defined in [RFC3986], Section 3&gt;
    26732675<a href="#uri" class="smpl">URI-reference</a> = &lt;URI-reference, defined in [RFC3986], Section 4.1&gt;
     
    26792681 ] *( OWS "," [ OWS received-protocol RWS received-by [ RWS comment ]
    26802682 ] )
     2683
    26812684<a href="#abnf.dependencies" class="smpl">Warning</a> = &lt;Warning, defined in [Part6], Section 15.6&gt;
    26822685
     
    27132716<a href="#message.types" class="smpl">generic-message</a> = start-line *( message-header CRLF ) CRLF [
    27142717 message-body ]
     2718
    27152719<a href="#http.uri" class="smpl">http-URI</a> = "http://" authority path-abempty [ "?" query ]
    27162720
     
    27292733<a href="#full.date" class="smpl">month</a> = s-Jan / s-Feb / s-Mar / s-Apr / s-May / s-Jun / s-Jul / s-Aug
    27302734 / s-Sep / s-Oct / s-Nov / s-Dec
     2735
    27312736<a href="#rule.whitespace" class="smpl">obs-fold</a> = CRLF
    27322737<a href="#rule.quoted-string" class="smpl">obs-text</a> = %x80-FF
  • draft-ietf-httpbis/latest/p1-messaging.xml

    r427 r428  
    44354435<x:ref>Response</x:ref> = Status-Line *( ( general-header / response-header /
    44364436 entity-header ) CRLF ) CRLF [ message-body ]
     4437
    44374438<x:ref>Status-Code</x:ref> = 3DIGIT
    44384439<x:ref>Status-Line</x:ref> = HTTP-Version SP Status-Code SP Reason-Phrase CRLF
     
    44454446<x:ref>Transfer-Encoding-v</x:ref> = *( "," OWS ) transfer-coding *( OWS "," [ OWS
    44464447 transfer-coding ] )
     4448
    44474449<x:ref>URI</x:ref> = &lt;URI, defined in [RFC3986], Section 3&gt;
    44484450<x:ref>URI-reference</x:ref> = &lt;URI-reference, defined in [RFC3986], Section 4.1&gt;
     
    44544456 ] *( OWS "," [ OWS received-protocol RWS received-by [ RWS comment ]
    44554457 ] )
     4458
    44564459<x:ref>Warning</x:ref> = &lt;Warning, defined in [Part6], Section 15.6&gt;
    44574460
     
    44884491<x:ref>generic-message</x:ref> = start-line *( message-header CRLF ) CRLF [
    44894492 message-body ]
     4493
    44904494<x:ref>http-URI</x:ref> = "http://" authority path-abempty [ "?" query ]
    44914495
     
    45044508<x:ref>month</x:ref> = s-Jan / s-Feb / s-Mar / s-Apr / s-May / s-Jun / s-Jul / s-Aug
    45054509 / s-Sep / s-Oct / s-Nov / s-Dec
     4510
    45064511<x:ref>obs-fold</x:ref> = CRLF
    45074512<x:ref>obs-text</x:ref> = %x80-FF
  • draft-ietf-httpbis/latest/p2-semantics.html

    r427 r428  
    22742274<a href="#abnf.dependencies" class="smpl">If-Unmodified-Since</a> = &lt;If-Unmodified-Since, defined in [Part4],
    22752275 Section 6.5&gt;
     2276
    22762277<a href="#header.location" class="smpl">Location</a> = "Location:" OWS Location-v
    22772278<a href="#header.location" class="smpl">Location-v</a> = absolute-URI [ "#" fragment ]
     
    22822283 %x50.4F.53.54 / %x50.55.54 / %x44.45.4C.45.54.45 / %x54.52.41.43.45
    22832284 / %x43.4F.4E.4E.45.43.54 / extension-method
     2285
    22842286<a href="#core.rules" class="smpl">OWS</a> = &lt;OWS, defined in [Part1], Section 1.2.2&gt;
    22852287
     
    22882290<a href="#abnf.dependencies" class="smpl">Proxy-Authorization</a> = &lt;Proxy-Authorization, defined in [Part7],
    22892291 Section 3.3&gt;
     2292
    22902293<a href="#core.rules" class="smpl">RWS</a> = &lt;RWS, defined in [Part1], Section 1.2.2&gt;
    22912294<a href="#abnf.dependencies" class="smpl">Range</a> = &lt;Range, defined in [Part5], Section 5.4&gt;
     
    23042307 "415" / "416" / "417" / "500" / "501" / "502" / "503" / "504" /
    23052308 "505" / extension-code
     2309
    23062310<a href="#abnf.dependencies" class="smpl">TE</a> = &lt;TE, defined in [Part1], Section 8.8&gt;
    23072311
     
    23132317<a href="#abnf.dependencies" class="smpl">WWW-Authenticate</a> = &lt;WWW-Authenticate, defined in [Part7], Section
    23142318 3.4&gt;
     2319
    23152320<a href="#abnf.dependencies" class="smpl">absolute-URI</a> = &lt;absolute-URI, defined in [Part1], Section 2.1&gt;
    23162321
     
    23442349<a href="#response.header.fields" class="smpl">response-header</a> = Accept-Ranges / Age / Allow / ETag / Location /
    23452350 Proxy-Authenticate / Retry-After / Server / Vary / WWW-Authenticate
     2351
    23462352<a href="#core.rules" class="smpl">token</a> = &lt;token, defined in [Part1], Section 1.2.2&gt;
    23472353
  • draft-ietf-httpbis/latest/p2-semantics.xml

    r427 r428  
    32343234<x:ref>If-Unmodified-Since</x:ref> = &lt;If-Unmodified-Since, defined in [Part4],
    32353235 Section 6.5&gt;
     3236
    32363237<x:ref>Location</x:ref> = "Location:" OWS Location-v
    32373238<x:ref>Location-v</x:ref> = absolute-URI [ "#" fragment ]
     
    32423243 %x50.4F.53.54 / %x50.55.54 / %x44.45.4C.45.54.45 / %x54.52.41.43.45
    32433244 / %x43.4F.4E.4E.45.43.54 / extension-method
     3245
    32443246<x:ref>OWS</x:ref> = &lt;OWS, defined in [Part1], Section 1.2.2&gt;
    32453247
     
    32483250<x:ref>Proxy-Authorization</x:ref> = &lt;Proxy-Authorization, defined in [Part7],
    32493251 Section 3.3&gt;
     3252
    32503253<x:ref>RWS</x:ref> = &lt;RWS, defined in [Part1], Section 1.2.2&gt;
    32513254<x:ref>Range</x:ref> = &lt;Range, defined in [Part5], Section 5.4&gt;
     
    32643267 "415" / "416" / "417" / "500" / "501" / "502" / "503" / "504" /
    32653268 "505" / extension-code
     3269
    32663270<x:ref>TE</x:ref> = &lt;TE, defined in [Part1], Section 8.8&gt;
    32673271
     
    32733277<x:ref>WWW-Authenticate</x:ref> = &lt;WWW-Authenticate, defined in [Part7], Section
    32743278 3.4&gt;
     3279
    32753280<x:ref>absolute-URI</x:ref> = &lt;absolute-URI, defined in [Part1], Section 2.1&gt;
    32763281
     
    33043309<x:ref>response-header</x:ref> = Accept-Ranges / Age / Allow / ETag / Location /
    33053310 Proxy-Authenticate / Retry-After / Server / Vary / WWW-Authenticate
     3311
    33063312<x:ref>token</x:ref> = &lt;token, defined in [Part1], Section 1.2.2&gt;
    33073313
  • draft-ietf-httpbis/latest/p3-payload.html

    r427 r428  
    17151715<a href="#header.accept" class="smpl">Accept-v</a> = [ ( "," / ( media-range [ accept-params ] ) ) *( OWS "," [
    17161716 OWS media-range [ accept-params ] ] ) ]
     1717
    17171718<a href="#header.content-encoding" class="smpl">Content-Encoding</a> = "Content-Encoding:" OWS Content-Encoding-v
    17181719<a href="#header.content-encoding" class="smpl">Content-Encoding-v</a> = *( "," OWS ) content-coding *( OWS "," [ OWS
     
    17511752<a href="#content-disposition" class="smpl">content-disposition-v</a> = disposition-type *( OWS ";" OWS
    17521753 disposition-parm )
     1754
    17531755<a href="#content-disposition" class="smpl">disp-extension-parm</a> = token "=" ( token / quoted-string )
    17541756<a href="#content-disposition" class="smpl">disp-extension-token</a> = token
  • draft-ietf-httpbis/latest/p3-payload.xml

    r427 r428  
    26732673<x:ref>Accept-v</x:ref> = [ ( "," / ( media-range [ accept-params ] ) ) *( OWS "," [
    26742674 OWS media-range [ accept-params ] ] ) ]
     2675
    26752676<x:ref>Content-Encoding</x:ref> = "Content-Encoding:" OWS Content-Encoding-v
    26762677<x:ref>Content-Encoding-v</x:ref> = *( "," OWS ) content-coding *( OWS "," [ OWS
     
    27092710<x:ref>content-disposition-v</x:ref> = disposition-type *( OWS ";" OWS
    27102711 disposition-parm )
     2712
    27112713<x:ref>disp-extension-parm</x:ref> = token "=" ( token / quoted-string )
    27122714<x:ref>disp-extension-token</x:ref> = token
  • draft-ietf-httpbis/latest/p5-range.html

    r427 r428  
    11061106<a href="#header.accept-ranges" class="smpl">acceptable-ranges</a> = ( *( "," OWS ) range-unit *( OWS "," [ OWS
    11071107 range-unit ] ) ) / "none"
     1108
    11081109<a href="#header.content-range" class="smpl">byte-content-range-spec</a> = bytes-unit SP byte-range-resp-spec "/" (
    11091110 instance-length / "*" )
     
    11181119<a href="#header.content-range" class="smpl">content-range-spec</a> = byte-content-range-spec /
    11191120 other-content-range-spec
     1121
    11201122<a href="#abnf.dependencies" class="smpl">entity-tag</a> = &lt;entity-tag, defined in [Part4], Section 2&gt;
    11211123
  • draft-ietf-httpbis/latest/p5-range.xml

    r427 r428  
    13951395<x:ref>acceptable-ranges</x:ref> = ( *( "," OWS ) range-unit *( OWS "," [ OWS
    13961396 range-unit ] ) ) / "none"
     1397
    13971398<x:ref>byte-content-range-spec</x:ref> = bytes-unit SP byte-range-resp-spec "/" (
    13981399 instance-length / "*" )
     
    14071408<x:ref>content-range-spec</x:ref> = byte-content-range-spec /
    14081409 other-content-range-spec
     1410
    14091411<x:ref>entity-tag</x:ref> = &lt;entity-tag, defined in [Part4], Section 2&gt;
    14101412
  • draft-ietf-httpbis/latest/p6-cache.html

    r427 r428  
    19391939<a href="#header.cache-control" class="smpl">Cache-Control-v</a> = *( "," OWS ) cache-directive *( OWS "," [ OWS
    19401940 cache-directive ] )
     1941
    19411942<a href="#header.expires" class="smpl">Expires</a> = "Expires:" OWS Expires-v
    19421943<a href="#header.expires" class="smpl">Expires-v</a> = HTTP-date
     
    19491950<a href="#header.pragma" class="smpl">Pragma-v</a> = *( "," OWS ) pragma-directive *( OWS "," [ OWS
    19501951 pragma-directive ] )
     1952
    19511953<a href="#header.vary" class="smpl">Vary</a> = "Vary:" OWS Vary-v
    19521954<a href="#header.vary" class="smpl">Vary-v</a> = "*" / ( *( "," OWS ) field-name *( OWS "," [ OWS field-name
    19531955 ] ) )
     1956
    19541957<a href="#header.warning" class="smpl">Warning</a> = "Warning:" OWS Warning-v
    19551958<a href="#header.warning" class="smpl">Warning-v</a> = *( "," OWS ) warning-value *( OWS "," [ OWS warning-value
    19561959 ] )
     1960
    19571961<a href="#header.cache-control" class="smpl">cache-directive</a> = cache-request-directive / cache-response-directive
    19581962<a href="#header.cache-control" class="smpl">cache-extension</a> = token [ "=" ( token / quoted-string ) ]
     
    19671971 "must-revalidate" / "proxy-revalidate" / ( "max-age=" delta-seconds
    19681972 ) / ( "s-maxage=" delta-seconds ) / cache-extension
     1973
    19691974<a href="#rule.delta-seconds" class="smpl">delta-seconds</a> = 1*DIGIT
    19701975
     
    19891994<a href="#header.warning" class="smpl">warning-value</a> = warn-code SP warn-agent SP warn-text [ SP warn-date
    19901995 ]
     1996
    19911997; Age defined but not used
    19921998; Cache-Control defined but not used
  • draft-ietf-httpbis/latest/p6-cache.xml

    r427 r428  
    29882988<x:ref>Cache-Control-v</x:ref> = *( "," OWS ) cache-directive *( OWS "," [ OWS
    29892989 cache-directive ] )
     2990
    29902991<x:ref>Expires</x:ref> = "Expires:" OWS Expires-v
    29912992<x:ref>Expires-v</x:ref> = HTTP-date
     
    29982999<x:ref>Pragma-v</x:ref> = *( "," OWS ) pragma-directive *( OWS "," [ OWS
    29993000 pragma-directive ] )
     3001
    30003002<x:ref>Vary</x:ref> = "Vary:" OWS Vary-v
    30013003<x:ref>Vary-v</x:ref> = "*" / ( *( "," OWS ) field-name *( OWS "," [ OWS field-name
    30023004 ] ) )
     3005
    30033006<x:ref>Warning</x:ref> = "Warning:" OWS Warning-v
    30043007<x:ref>Warning-v</x:ref> = *( "," OWS ) warning-value *( OWS "," [ OWS warning-value
    30053008 ] )
     3009
    30063010<x:ref>cache-directive</x:ref> = cache-request-directive / cache-response-directive
    30073011<x:ref>cache-extension</x:ref> = token [ "=" ( token / quoted-string ) ]
     
    30163020 "must-revalidate" / "proxy-revalidate" / ( "max-age=" delta-seconds
    30173021 ) / ( "s-maxage=" delta-seconds ) / cache-extension
     3022
    30183023<x:ref>delta-seconds</x:ref> = 1*DIGIT
    30193024
     
    30383043<x:ref>warning-value</x:ref> = warn-code SP warn-agent SP warn-text [ SP warn-date
    30393044 ]
     3045
    30403046; Age defined but not used
    30413047; Cache-Control defined but not used
  • draft-ietf-httpbis/latest/p7-auth.html

    r427 r428  
    826826<a href="#header.www-authenticate" class="smpl">WWW-Authenticate-v</a> = *( "," OWS ) challenge *( OWS "," [ OWS
    827827 challenge ] )
     828
    828829<a href="#abnf.dependencies" class="smpl">challenge</a> = &lt;challenge, defined in [RFC2617], Section 1.2&gt;
    829830<a href="#abnf.dependencies" class="smpl">credentials</a> = &lt;credentials, defined in [RFC2617], Section 1.2&gt;
  • draft-ietf-httpbis/latest/p7-auth.xml

    r427 r428  
    829829<x:ref>WWW-Authenticate-v</x:ref> = *( "," OWS ) challenge *( OWS "," [ OWS
    830830 challenge ] )
     831
    831832<x:ref>challenge</x:ref> = &lt;challenge, defined in [RFC2617], Section 1.2&gt;
    832833<x:ref>credentials</x:ref> = &lt;credentials, defined in [RFC2617], Section 1.2&gt;
     
    841842</figure>
    842843</section>
     844
    843845
    844846<section title="Change Log (to be removed by RFC Editor before publication)"  anchor="change.log">
Note: See TracChangeset for help on using the changeset viewer.