suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Scribble reader to attach originalness to the syntax objects that it generates, so that Check Syntax works properly on Scribble documents

Browse Source 
svn: r9125
This commit is contained in:
Matthew Flatt 2008-04-01 17:11:30 +00:00
parent 70d1623e6a
commit aee99cd175
3 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
collects/scribble/latex-render.ss
View File

@ -51,12 +51,15 @@
(pair? number))
(when (part-style? d 'index)
(printf "\\twocolumn\n\\parskip=0pt\n\\addcontentsline{toc}{section}{Index}\n"))
(printf "\\~a~a{"
(printf "\\~a~a~a{"
(case (length number)
[(0 1) "sectionNewpage\n\n\\section"]
[(2) "subsection"]
[(3) "subsubsection"]
[else "subsubsection*"])
(if (part-style? d 'hidden)
"hidden"
"")
(if (and (pair? number)
(not (car number)))
"*"

53
collects/scribble/reader.ss
View File

@ -160,6 +160,9 @@
(unless (eol-syntax? (datum->syntax #f eol-token))
(internal-error 'invalid-assumption))
;; A syntax object that has the "original?" property:
(define orig-stx (read-syntax #f (open-input-string "dummy")))
;; ----------------------------------------------------------------------------
;; main reader function for @ constructs
@ -266,12 +269,13 @@
(string? 2nd) (not (eq? eol-token 2nd)))
(cons (datum->syntax stx0
(string-append 1st 2nd)
(list (syntax-source stx0)
(syntax-line stx0)
(syntax-column stx0)
(syntax-position stx0)
;; this is called right after reading stx
(span-from (syntax-position stx0))))
(vector (syntax-source stx0)
(syntax-line stx0)
(syntax-column stx0)
(syntax-position stx0)
;; this is called right after reading stx
(span-from (syntax-position stx0)))
stx0)
(cdr stxs))
(cons stx stxs))))
@ -297,7 +301,8 @@
(define (make-stx sexpr)
(datum->syntax #f
(if (bytes? sexpr) (bytes->string/utf-8 sexpr) sexpr)
(list source-name line col pos (span-from pos))))
(vector source-name line col pos (span-from pos))
orig-stx))
(cond
[(and re:begin (*match1 re:begin))
=> (lambda (m) (loop (add1 lvl) (maybe-merge (make-stx m) r)))]
@ -402,11 +407,12 @@
;; we have a command: adjust its location to include the dispatch
;; character
[else (datum->syntax #f (syntax-e cmd)
(list (syntax-source cmd)
(syntax-line cmd)
(cond [(syntax-column cmd) => sub1] [else #f])
(cond [(syntax-position cmd) => sub1] [else #f])
(cond [(syntax-span cmd) => add1] [else #f])))])))
(vector (syntax-source cmd)
(syntax-line cmd)
(cond [(syntax-column cmd) => sub1] [else #f])
(cond [(syntax-position cmd) => sub1] [else #f])
(cond [(syntax-span cmd) => add1] [else #f]))
orig-stx)])))
(define (get-rprefixes) ; return punctuation prefixes in reverse
(let loop ([r '()])
@ -420,8 +426,9 @@
=> cadr]
[else (internal-error 'get-rprefixes)])])
(loop (cons (datum->syntax #f sym
(list source-name line col pos
(span-from pos)))
(vector source-name line col pos
(span-from pos))
orig-stx)
r))))]
[(*skip re:whitespaces)
(read-error* "unexpected whitespace after ~a" ch:command)]
@ -430,7 +437,8 @@
(cond
[start-inside?
(datum->syntax #f (get-lines* #f #f #f re:line-item-no-nests #f)
(list source-name line-num col-num position (span-from position)))]
(vector source-name line-num col-num position (span-from position))
orig-stx)]
[(*skip re:whitespaces)
(read-error* "unexpected whitespace after ~a" ch:command)]
[(*skip re:comment-start)
@ -463,8 +471,9 @@
(if (syntax? stx)
stx
(datum->syntax #f stx
(list source-name line-num col-num position
(span-from position))))
(vector source-name line-num col-num position
(span-from position))
orig-stx))
'scribble (list 'form ds ls))
stx))]
[(stx) (syntax-post-processor stx)]
@ -474,8 +483,9 @@
(if (null? rpfxs)
stx
(loop (cdr rpfxs) (list (car rpfxs) stx))))])
(datum->syntax #f stx (list source-name line-num col-num position
(span-from position))))]))
(datum->syntax #f stx (vector source-name line-num col-num position
(span-from position))
orig-stx))]))
(define (make-dispatcher start-inside? ch:command
get-command-readtable get-datum-readtable
@ -526,8 +536,9 @@
line-num col-num position #f))
(datum->syntax
#f (string->symbol (bytes->string/utf-8 (cadr m)))
(list source-name line-num col-num position
(add1 (bytes-length (car m)))))))))
(vector source-name line-num col-num position
(add1 (bytes-length (car m))))
orig-stx)))))
(define datum-rt
(cond [(or (not datum-readtable) (readtable? datum-readtable))
datum-readtable]

7
collects/scribble/scribble.tex
View File

@ -80,6 +80,13 @@
\newenvironment{supertabular}{\begin{longtable}}{\end{longtable}\vspace{-3ex}}
\newcommand{\supertabline}{\vspace{-2ex}}
\newcommand{\sectionhidden}[1]{\section{#1}}
\newcommand{\subsectionhidden}[1]{\subsection{#1}}
\newcommand{\subsubsectionhidden}[1]{\subsubsection{#1}}
\newcommand{\sectionhidden*}[1]{\section*{#1}}
\newcommand{\subsectionhidden*}[1]{\subsection*{#1}}
\newcommand{\subsubsectionhidden*}[1]{\subsubsection*{#1}}
% Scribble then generates the following:
%
% \begin{document}