Skip to content

Commit 37651d3

Browse files
committed
Update Approved Changes
Edit sources and `CHANGES.md` to mirror approved changes: - closes #47. - closes #48.
1 parent fb91d04 commit 37651d3

8 files changed

+99
-21
lines changed

CHANGES.md

+83-5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ This document lists all the contents changes that theAsciiDoc edition has introd
2424
- [4.8. _What Should I Be Able to Do Now?_](#48-what-should-i-be-able-to-do-now)
2525
- [5. Routines and Events](#5-routines-and-events)
2626
- [5.3. _Before And After Routines_](#53-before-and-after-routines)
27+
- [7. Grammar and Parsing](#7-grammar-and-parsing)
28+
- [7.1. Grammar Definition](#71-grammar-definition)
2729
- [9. The Game Loop](#9-the-game-loop)
2830
- [9.2. _What Should I Be Able to Do Now?_](#92-what-should-i-be-able-to-do-now)
2931
- [10. Using the Object Library](#10-using-the-object-library)
@@ -33,6 +35,10 @@ This document lists all the contents changes that theAsciiDoc edition has introd
3335
- [12.2. _Pictures_](#122-pictures)
3436
- [12.3. _Sound and Music_](#123-sound-and-music)
3537
- [App. A. Summary of Keywords and Commands](#app-a-summary-of-keywords-and-commands)
38+
- [App. B. The Hugo Library](#app-b-the-hugo-library)
39+
- [B.7.Utility Routines, Etc.](#b7utility-routines-etc)
40+
- [Book II](#book-ii)
41+
- [17. Grammar](#17-grammar)
3642

3743
<!-- /MarkdownTOC -->
3844

@@ -240,6 +246,24 @@ The paragraph end was amended by Kent Tessman to:
240246
(See [Issue #14])
241247

242248

249+
### 7. Grammar and Parsing
250+
251+
List of changes to Chapter [7. _Grammar and Parsing_][Ch7].
252+
253+
#### 7.1. Grammar Definition
254+
255+
<!-- Issue #48 --------------------------------------------------------------->
256+
257+
In _[§7.1. Grammar Definition]_, where [dynamic grammars are being discussed][dyngramm1], the following TIP admonition block was added:
258+
259+
> For more details on dynamic grammars, see the [_Grammar_ chapter in _Book II_][dyngramm2].
260+
261+
Because dynamic grammars are only briefly mentioned in the book, custom anchors were added in the only two places where they are discussed, along with a side note cross-referencing them to each other.
262+
263+
For the other added cross reference, see the changes in [17. Grammar](#17-grammar).
264+
265+
(See [Issue #48])
266+
243267
### 9. The Game Loop
244268

245269
List of changes to Chapter [9. _The Game Loop_][Ch9].
@@ -378,7 +402,6 @@ PlayMusic(<resourcefile>, <song>[, <volume>[, <loop>[, <force>]]])
378402

379403
List of changes to Appendix [A. _Summary of Keywords and Commands_][AppA].
380404

381-
382405
---
383406

384407
<!-- Issue #27 --------------------------------------------------------------->
@@ -397,7 +420,6 @@ This was necessary because not all output formats have page numbers (HTML docume
397420

398421
(See [Issue #27])
399422

400-
401423
---
402424

403425
<!-- Issue #28 --------------------------------------------------------------->
@@ -410,10 +432,56 @@ In the definition of `print`, after the `print <output>` syntax:
410432

411433
> where `<output>` can consist of both text strings enclosed in quotation marks (`"…​"`), and values representing dictionary addresses
412434
413-
414435
(See [Issue #28])
415436

416437

438+
### App. B. The Hugo Library
439+
440+
List of changes to Appendix [B. _The Hugo Library_][AppB].
441+
442+
#### B.7.Utility Routines, Etc.
443+
444+
<!-- Issue #47 --------------------------------------------------------------->
445+
446+
In [§B.7. _Utility Routines, Etc._], in the definition of the `ObjWord` Library routine:
447+
448+
> calling form:
449+
>
450+
> ```
451+
> ObjWord(word, object)
452+
> ```
453+
>
454+
> Returns either `adjective` or `noun` (i.e., the property number) if the given is either an adjective or noun of the specified object.
455+
456+
The missing term "`word`" was added after "if the given":
457+
458+
> if the given `word` is either an adjective ...
459+
460+
(See [Issue #47])
461+
462+
463+
## Book II
464+
465+
List of changes to [Book II: _Technical System Specification_][Book2].
466+
467+
### 17. Grammar
468+
469+
List of changes to Chapter [17. _Grammar_][Ch17].
470+
471+
---
472+
473+
<!-- Issue #48 --------------------------------------------------------------->
474+
475+
In Chapter [17. _Grammar_][Ch17], where [dynamic grammars are being discussed][dyngramm2], the following note within parenthesis was added:
476+
477+
> (See also [_Book I_ on dynamic grammars][dyngramm1].)
478+
479+
Because dynamic grammars are only briefly mentioned in the book, custom anchors were added in the only two places where they are discussed, along with a side note cross-referencing them to each other.
480+
481+
For the other added cross reference, see the changes in [7.1. Grammar Definition](#71-grammar-definition).
482+
483+
(See [Issue #48])
484+
417485
<!-----------------------------------------------------------------------------
418486
REFERENCE LINKS
419487
------------------------------------------------------------------------------>
@@ -438,35 +506,45 @@ In the definition of `print`, after the `print <output>` syntax:
438506
[Issue #30]: https://github.com/tajmone/hugo-book/issues/30 "View Issue #30 regarding this text amendment"
439507
[Issue #36]: https://github.com/tajmone/hugo-book/issues/36 "View Issue #36 regarding this text amendment"
440508
[Issue #38]: https://github.com/tajmone/hugo-book/issues/38 "View Issue #38 regarding this text amendment"
509+
[Issue #47]: https://github.com/tajmone/hugo-book/issues/47 "View Issue #47 regarding this text amendment"
510+
[Issue #48]: https://github.com/tajmone/hugo-book/issues/48 "View Issue #48 regarding this text amendment"
441511
442512
<!-- Live HTML Links -->
443513
444514
[Book1]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#book1 "Jump to Live HTML Preview of: Book I"
445-
446515
[Ch1]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_1 "Jump to Live HTML Preview of: Book I » 1. INTRODUCTION"
447516
[Ch2]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_2 "Jump to Live HTML Preview of: Book I » 2. A FIRST LOOK AT HUGO"
448517
[Ch3]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_3 "Jump to Live HTML Preview of: Book I » 3. OBJECTS"
449518
[Ch4]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_4 "Jump to Live HTML Preview of: Book I » 4. HUGO PROGRAMMING"
450519
[Ch5]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_5 "Jump to Live HTML Preview of: Book I » 5. ROUTINES AND EVENTS"
451520
[Ch6]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_6 "Jump to Live HTML Preview of: Book I » 6. FUSES, DAEMONS, AND SCRIPTS"
521+
[Ch7]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_7 "Jump to Live HTML Preview of: Book I » 7. GRAMMAR AND PARSING"
452522
[Ch9]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_9 "Jump to Live HTML Preview of: Book I » 9. THE GAME LOOP"
453523
[Ch10]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_10 "Jump to Live HTML Preview of: Book I » 10. USING THE OBJECT LIBRARY"
454524
[Ch12]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_12 "Jump to Live HTML Preview of: Book I » 12. RESOURCES"
455525
[AppA]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#appendix_a "Jump to Live HTML Preview of: Book I » Appendix A: SUMMARY OF KEYWORDS AND COMMANDS"
526+
[AppB]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#appendix_b "Jump to Live HTML Preview of: Book I » Appendix A: SUMMARY OF KEYWORDS AND COMMANDS"
527+
528+
[Book2]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#book2 "Jump to Live HTML Preview of: Book II"
529+
[Ch17]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#chapter_17 "Jump to Live HTML Preview of: Book II » 17. GRAMMAR"
530+
456531
457532
[§1.5. Packing List]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_1-5 "Live HTML Preview"
458533
[§1.10. Limit Settings]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_1-10 "Live HTML Preview"
459534
[§2.4. Multiple Lines]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_2-4 "Live HTML Preview"
460535
[§4.8. What Should I Be Able to Do Now?]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_4-8 "Live HTML Preview"
461536
[§5.3. Before And After Routines]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_5-3 "Live HTML Preview"
537+
[§7.1. Grammar Definition]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_7-1 "Live HTML Preview"
462538
[§9.2. What Should I Be Able to Do Now?]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_9-2 "Live HTML Preview"
463539
[§10.5. Doors]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_10-5 "Live HTML Preview"
464540
[§10.6. Vehicles]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_10-6 "Live HTML Preview"
465541
[§12.2. Pictures]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_12-2 "Live HTML Preview"
466542
[§12.3. Sound and Music]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_12-3 "Live HTML Preview"
543+
[§B.7. _Utility Routines, Etc._]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#sec_b-7 "Live HTML Preview"
467544
468545
[Sec. 4.3]: http://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#hugolib-colors "Live HTML Preview"
469546
470-
547+
[dyngramm1]: https://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#dynamic-grammars1 "Live HTML Preview"
548+
[dyngramm2]: https://htmlpreview.github.io/?https://github.com/tajmone/hugo-book/blob/draft/hugo-book.html#dynamic-grammars2 "Live HTML Preview"
471549
472550
<!-- EOF -->

docs/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,8 @@ <h1>The Hugo Book</h1>
583583
<div class="details">
584584
<span id="author" class="author">Kent Tessman</span><br>
585585
<span id="email" class="email"><a href="mailto:general@generalcoffee.com">general@generalcoffee.com</a></span><br>
586-
<span id="revnumber">v 1.0.0-RC2,</span>
587-
<span id="revdate">2020/01/28</span>
586+
<span id="revnumber">v 1.0.0-RC3,</span>
587+
<span id="revdate">2020/01/29</span>
588588
<br><span id="revremark">1st Ed. revised January 2020</span>
589589
</div>
590590
<div id="toc" class="toc2">
@@ -22240,7 +22240,7 @@ <h2 id="appendix_h"><a class="anchor" href="#appendix_h"></a>Appendix H: Code Pa
2224022240
</div>
2224122241
<div id="footer">
2224222242
<div id="footer-text">
22243-
v 1.0.0-RC2<br>
22243+
v 1.0.0-RC3<br>
2224422244
</div>
2224522245
</div>
2224622246
</body>

docs_src/hugo-book.asciidoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= The Hugo Book
22
Kent Tessman <general@generalcoffee.com>
3-
:revnumber: 1.0.0-RC2
4-
:revdate: 2020/01/28
3+
:revnumber: 1.0.0-RC3
4+
:revdate: 2020/01/29
55
:edition: 1st Ed.
66
:editionrev: January 2020
77
:revremark: {edition} revised {editionrev}

docs_src/hugo-book1_07.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ which will have the effect of, instead of defining the verb with a dictionary wo
7575
What this allows is for the `some_object.noun` property to be a routine that can return varying values at runtime in order to provide for dynamic grammar, if required.
7676
However, since this sort of dynamic grammar isn't often required, static grammar definitions are far more common.
7777

78-
// @EDITED XREF ADDED: (undocumented & waiting approval: Issue #48)
78+
// @EDITED XREF ADDED: (Issue #48)
7979
// The following admonition block was added to the original book to provide
8080
// a cross reference to learn more about dynamic grammars.
8181

docs_src/hugo-book1_14.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ If so, it also sets the global `light_source` to the object number of the source
10251025
[literal,role="hugosyntax"]
10261026
ObjWord(word, object)
10271027

1028-
// @EDITED TEXT: (undocumented & waiting approval: Issue #47)
1028+
// @EDITED TEXT: (Issue #47)
10291029
// Reconstucted missing word: "if the given [`word`] is either"
10301030
Returns either `adjective` or `noun` (i.e., the property number) if the given `word` is either an adjective or noun of the specified object.
10311031

docs_src/hugo-book2_05.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The grammar table in this case would look like
5757

5858
where $FFFF is the signal that instead of a dictionary word address, the engine must read the following discrete value, where $4A is the `object#` token, and $__x1x2__ is the object number of `get_object`.
5959
This extension is provided so that grammar may be dynamically coded and changed at runtime.
60-
// @EDITED XREF ADDED: (undocumented & waiting approval: Issue #48)
60+
// @EDITED XREF ADDED: (Issue #48)
6161
// The following cross reference was added to the original book:
6262
(See also <<dynamic-grammars1,_Book I_ on dynamic grammars definitions>>.)
6363

hugo-book.asciidoc

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= The Hugo Book
22
Kent Tessman <general@generalcoffee.com>
3-
:revnumber: 1.0.0-RC2
4-
:revdate: 2020/01/28
3+
:revnumber: 1.0.0-RC3
4+
:revdate: 2020/01/29
55
:edition: 1st Ed.
66
:editionrev: January 2020
77
:revremark: {edition} revised {editionrev}
@@ -5480,7 +5480,7 @@ which will have the effect of, instead of defining the verb with a dictionary wo
54805480
What this allows is for the `some_object.noun` property to be a routine that can return varying values at runtime in order to provide for dynamic grammar, if required.
54815481
However, since this sort of dynamic grammar isn't often required, static grammar definitions are far more common.
54825482

5483-
// @EDITED XREF ADDED: (undocumented & waiting approval: Issue #48)
5483+
// @EDITED XREF ADDED: (Issue #48)
54845484
// The following admonition block was added to the original book to provide
54855485
// a cross reference to learn more about dynamic grammars.
54865486

@@ -10052,7 +10052,7 @@ If so, it also sets the global `light_source` to the object number of the source
1005210052
[literal,role="hugosyntax"]
1005310053
ObjWord(word, object)
1005410054

10055-
// @EDITED TEXT: (undocumented & waiting approval: Issue #47)
10055+
// @EDITED TEXT: (Issue #47)
1005610056
// Reconstucted missing word: "if the given [`word`] is either"
1005710057
Returns either `adjective` or `noun` (i.e., the property number) if the given `word` is either an adjective or noun of the specified object.
1005810058

@@ -11658,7 +11658,7 @@ The grammar table in this case would look like
1165811658

1165911659
where $FFFF is the signal that instead of a dictionary word address, the engine must read the following discrete value, where $4A is the `object#` token, and $__x1x2__ is the object number of `get_object`.
1166011660
This extension is provided so that grammar may be dynamically coded and changed at runtime.
11661-
// @EDITED XREF ADDED: (undocumented & waiting approval: Issue #48)
11661+
// @EDITED XREF ADDED: (Issue #48)
1166211662
// The following cross reference was added to the original book:
1166311663
(See also <<dynamic-grammars1,_Book I_ on dynamic grammars definitions>>.)
1166411664

hugo-book.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,8 @@ <h1>The Hugo Book</h1>
583583
<div class="details">
584584
<span id="author" class="author">Kent Tessman</span><br>
585585
<span id="email" class="email"><a href="mailto:general@generalcoffee.com">general@generalcoffee.com</a></span><br>
586-
<span id="revnumber">v 1.0.0-RC2,</span>
587-
<span id="revdate">2020/01/28</span>
586+
<span id="revnumber">v 1.0.0-RC3,</span>
587+
<span id="revdate">2020/01/29</span>
588588
<br><span id="revremark">1st Ed. revised January 2020</span>
589589
</div>
590590
<div id="toc" class="toc2">
@@ -22240,7 +22240,7 @@ <h2 id="appendix_h"><a class="anchor" href="#appendix_h"></a>Appendix H: Code Pa
2224022240
</div>
2224122241
<div id="footer">
2224222242
<div id="footer-text">
22243-
v 1.0.0-RC2<br>
22243+
v 1.0.0-RC3<br>
2224422244
</div>
2224522245
</div>
2224622246
</body>

0 commit comments

Comments
 (0)