From 17867769614fc1d3484aa3a57eb24f16779b8296 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Wed, 29 Jul 2009 17:00:29 +0000 Subject: [PATCH] `@foo@bar' will now parse as a `foo@bar' identifier. This used to be the case in Scheme mode but not in text mode, and this commit makes the text mode behave as the Scheme mode. (Seems like a convenience point that is not useful since people won't remember the difference.) svn: r15622 original commit: d0f8970addc95bb98c17bfac06ca9077ec535e51 --- collects/scribblings/scribble/preprocessor.scrbl | 10 +++++----- collects/tests/scribble/reader.ss | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/collects/scribblings/scribble/preprocessor.scrbl b/collects/scribblings/scribble/preprocessor.scrbl index e9278f9a..1eefe135 100644 --- a/collects/scribblings/scribble/preprocessor.scrbl +++ b/collects/scribblings/scribble/preprocessor.scrbl @@ -283,7 +283,7 @@ separate text arguments in the S-expression part of an @"@"-form. @example|-{#lang scribble/text @(define (choose 1st 2nd) - @list{Either @1st, or @2nd@"."}) + @list{Either @1st, or @|2nd|@"."}) @(define who "us") @choose[@list{you're with @who} @list{against @who}] @@ -297,7 +297,7 @@ sub-parts without dealing with quotes. @example|-{#lang scribble/text @(define (choose 1st 2nd) - @list{Either @1st, or @2nd@"."}) + @list{Either @1st, or @|2nd|@"."}) @(define who "us") @choose[@list{you're with @who} @list{against @who}] @@ -324,9 +324,9 @@ convenient --- you can even specify the patterns with @"@"-forms. @(require scheme/match) @(define (features . text) (match text - [@list{@1st@... + [@list{@|1st|@... --- - @2nd@...} + @|2nd|@...} @list{>> Pros << @1st; >> Cons << @@ -369,7 +369,7 @@ number of body expressions must be fixed. @example|-{#lang scribble/text @(define ((choose . 1st) . 2nd) - @list{Either you're @1st, or @2nd@"."}) + @list{Either you're @1st, or @|2nd|.}) @(define who "me") @@choose{with @who}{against @who} ---***--- diff --git a/collects/tests/scribble/reader.ss b/collects/tests/scribble/reader.ss index de6e5030..d2c07d03 100644 --- a/collects/tests/scribble/reader.ss +++ b/collects/tests/scribble/reader.ss @@ -31,13 +31,13 @@ fo@o -@-> fo@o --- |@foo| -@-> @foo --- -@foo@bar -@-> foo bar +@foo@bar -@-> foo@bar --- -@foo@bar. -@-> foo bar. +@foo@bar. -@-> foo@bar. --- -@foo@bar: -@-> foo bar: +@foo@bar: -@-> foo@bar: --- -@foo@bar; -@-> foo bar +@foo@bar; -@-> foo@bar --- @foo[]@bar{} -@-> (foo) (bar) ---