diff --git a/Makefile b/Makefile
index ec3ea1be..a2676371 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ zooprj:
xsltproc _dev/list2makefile.xslt _dev/zoo.xml > _dev/Makefile.x
make -f _dev/Makefile.x
xsltproc --stringparam date `date +"%d/%m/%Y"` _dev/list2xhtml.xslt _dev/zoo.xml > zoo/index.html
- xsltproc _dev/links2html.xslt _dev/java-grammars.xml | python ../topics/export/hypertext/closemeta.py > zoo/java/links.html
+ xsltproc _dev/links2html.xslt _dev/java-grammars.xml | python ../slps/topics/export/hypertext/closemeta.py > zoo/java/links.html
tankprj:
rm -f tank/*/*
diff --git a/_dev/Makefile.x b/_dev/Makefile.x
new file mode 100644
index 00000000..6ac3d635
--- /dev/null
+++ b/_dev/Makefile.x
@@ -0,0 +1,85 @@
+all:
+ cp ../slps/topics/grammars/ada/kempe/grammar.bgf zoo/ada/kempe.bgf
+ _dev/format zoo ada/kempe ada/kempe
+ cp ../slps/topics/grammars/ada/laemmel-verhoef/grammar.bgf zoo/ada/laemmel-verhoef.bgf
+ _dev/format zoo ada/laemmel-verhoef ada/laemmel-verhoef
+ cp ../slps/topics/grammars/ada/lncs-2219/grammar.bgf zoo/ada/lncs-2219.bgf
+ _dev/format zoo ada/lncs-2219 ada/lncs-2219
+ cp ../slps/topics/grammars/ada/kellogg/grammar.bgf zoo/ada/kellogg.bgf
+ _dev/format zoo ada/kellogg ada/kellogg
+ cp ../slps/topics/grammars/ada/lncs-4348/grammar.bgf zoo/ada/lncs-4348.bgf
+ _dev/format zoo ada/lncs-4348 ada/lncs-4348
+ cp ../slps/topics/grammars/c/iso-9899-1999/grammar.bgf zoo/c/iso-9899-1999.bgf
+ _dev/format zoo c/iso-9899-1999 c/iso-9899-1999
+ cp ../slps/topics/grammars/c/iso-9899-tc2/grammar.bgf zoo/c/iso-9899-tc2.bgf
+ _dev/format zoo c/iso-9899-tc2 c/iso-9899-tc2
+ cp ../slps/topics/grammars/c/iso-9899-tc3/grammar.bgf zoo/c/iso-9899-tc3.bgf
+ _dev/format zoo c/iso-9899-tc3 c/iso-9899-tc3
+ cp ../slps/topics/grammars/cpp/iso-14882-1998/grammar.bgf zoo/cpp/iso-14882-1998.bgf
+ _dev/format zoo cpp/iso-14882-1998 cpp/iso-14882-1998
+ cp ../slps/topics/grammars/cpp/iso-n2723/grammar.bgf zoo/cpp/iso-n2723.bgf
+ _dev/format zoo cpp/iso-n2723 cpp/iso-n2723
+ cp ../slps/topics/grammars/csharp/ecma-334-1/grammar.bgf zoo/cs/csharp-ecma-334-1.bgf
+ _dev/format zoo cs/csharp-ecma-334-1 csharp/ecma-334-1
+ cp ../slps/topics/grammars/csharp/ecma-334-2/grammar.bgf zoo/cs/csharp-ecma-334-2.bgf
+ _dev/format zoo cs/csharp-ecma-334-2 csharp/ecma-334-2
+ cp ../slps/topics/grammars/csharp/zaytsev/grammar.bgf zoo/cs/csharp-zaytsev.bgf
+ _dev/format zoo cs/csharp-zaytsev csharp/zaytsev
+ cp ../slps/topics/grammars/csharp/iso-23270-2003/grammar.bgf zoo/cs/csharp-iso-23270-2003.bgf
+ _dev/format zoo cs/csharp-iso-23270-2003 csharp/iso-23270-2003
+ cp ../slps/topics/grammars/csharp/msft-ls-1.0/grammar.bgf zoo/cs/csharp-msft-ls-1.0.bgf
+ _dev/format zoo cs/csharp-msft-ls-1.0 csharp/msft-ls-1.0
+ cp ../slps/topics/grammars/csharp/msft-ls-1.2/grammar.bgf zoo/cs/csharp-msft-ls-1.2.bgf
+ _dev/format zoo cs/csharp-msft-ls-1.2 csharp/msft-ls-1.2
+ cp ../slps/topics/grammars/csharp/ecma-334-3/grammar.bgf zoo/cs/csharp-ecma-334-3.bgf
+ _dev/format zoo cs/csharp-ecma-334-3 csharp/ecma-334-3
+ cp ../slps/topics/grammars/csharp/ecma-334-4/grammar.bgf zoo/cs/csharp-ecma-334-4.bgf
+ _dev/format zoo cs/csharp-ecma-334-4 csharp/ecma-334-4
+ cp ../slps/topics/grammars/csharp/iso-23270-2006/grammar.bgf zoo/cs/csharp-iso-23270-2006.bgf
+ _dev/format zoo cs/csharp-iso-23270-2006 csharp/iso-23270-2006
+ cp ../slps/topics/grammars/csharp/msft-ls-3.0/grammar.bgf zoo/cs/csharp-msft-ls-3.0.bgf
+ _dev/format zoo cs/csharp-msft-ls-3.0 csharp/msft-ls-3.0
+ cp ../slps/topics/grammars/csharp/msft-ls-4.0/grammar.bgf zoo/cs/csharp-msft-ls-4.0.bgf
+ _dev/format zoo cs/csharp-msft-ls-4.0 csharp/msft-ls-4.0
+ cp ../slps/topics/grammars/dart/google/grammar.bgf zoo/dart/google.bgf
+ _dev/format zoo dart/google dart/google
+ cp ../slps/topics/grammars/dart/spec-0.01/grammar.bgf zoo/dart/spec-0.01.bgf
+ _dev/format zoo dart/spec-0.01 dart/spec-0.01
+ cp ../slps/topics/grammars/dart/spec-0.05/grammar.bgf zoo/dart/spec-0.05.bgf
+ _dev/format zoo dart/spec-0.05 dart/spec-0.05
+ cp ../slps/topics/grammars/eiffel/bezault/grammar.bgf zoo/eiffel/bezault.bgf
+ _dev/format zoo eiffel/bezault eiffel/bezault
+ cp ../slps/topics/grammars/eiffel/iso-25436-2006/grammar.bgf zoo/eiffel/iso-25436-2006.bgf
+ _dev/format zoo eiffel/iso-25436-2006 eiffel/iso-25436-2006
+ cp ../slps/topics/grammars/fortran/derricks/grammar.bgf zoo/fortran/derricks.bgf
+ _dev/format zoo fortran/derricks fortran/derricks
+ cp ../slps/topics/grammars/java-1/jls-read/grammar.bgf zoo/java/java-1-jls-read.bgf
+ _dev/format zoo java/java-1-jls-read java-1/jls-read
+ cp ../slps/topics/grammars/java-1/jls-impl/grammar.bgf zoo/java/java-1-jls-impl.bgf
+ _dev/format zoo java/java-1-jls-impl java-1/jls-impl
+ cp ../slps/topics/grammars/java-2/jls-read/grammar.bgf zoo/java/java-2-jls-read.bgf
+ _dev/format zoo java/java-2-jls-read java-2/jls-read
+ cp ../slps/topics/grammars/java-2/jls-impl/grammar.bgf zoo/java/java-2-jls-impl.bgf
+ _dev/format zoo java/java-2-jls-impl java-2/jls-impl
+ cp ../slps/topics/grammars/java-5/jls-read/grammar.bgf zoo/java/java-5-jls-read.bgf
+ _dev/format zoo java/java-5-jls-read java-5/jls-read
+ cp ../slps/topics/grammars/java-5/jls-impl/grammar.bgf zoo/java/java-5-jls-impl.bgf
+ _dev/format zoo java/java-5-jls-impl java-5/jls-impl
+ cp ../slps/topics/grammars/java-5/stahl/grammar.bgf zoo/java/java-5-stahl.bgf
+ _dev/format zoo java/java-5-stahl java-5/stahl
+ cp ../slps/topics/grammars/java-5/studman/grammar.bgf zoo/java/java-5-studman.bgf
+ _dev/format zoo java/java-5-studman java-5/studman
+ cp ../slps/topics/grammars/java-5/parr/grammar.bgf zoo/java/java-5-parr.bgf
+ _dev/format zoo java/java-5-parr java-5/parr
+ cp ../slps/topics/grammars/java-5/habelitz/grammar.bgf zoo/java/java-5-habelitz.bgf
+ _dev/format zoo java/java-5-habelitz java-5/habelitz
+ cp ../slps/topics/grammars/modula/src-052/grammar.bgf zoo/modula/src-052.bgf
+ _dev/format zoo modula/src-052 modula/src-052
+ cp ../slps/topics/grammars/modula/sdf/grammar.bgf zoo/modula/sdf.bgf
+ _dev/format zoo modula/sdf modula/sdf
+ cp ../slps/topics/grammars/w3c/xpath1/grammar.bgf zoo/xpath/w3c-xpath1.bgf
+ _dev/format zoo xpath/w3c-xpath1 w3c/xpath1
+ cp ../slps/topics/grammars/wiki/mediawiki-bnf/grammar.bgf zoo/wiki/mediawiki-bnf.bgf
+ _dev/format zoo wiki/mediawiki-bnf wiki/mediawiki-bnf
+ cp ../slps/topics/grammars/wiki/mediawiki-ebnf/grammar.bgf zoo/wiki/mediawiki-ebnf.bgf
+ _dev/format zoo wiki/mediawiki-ebnf wiki/mediawiki-ebnf
diff --git a/_dev/tank.xml b/_dev/tank.xml
index bfd73f13..aaac3081 100644
--- a/_dev/tank.xml
+++ b/_dev/tank.xml
@@ -184,7 +184,7 @@
1–25 Aug 2008
- https://github.com/grammarware/slps/tree/master/topics/fl/asfsdf
+ topics/fl/asfsdf
GitHub
@@ -283,7 +283,7 @@
17 May – 28 July 2008
- https://github.com/grammarware/slps/tree/master/topics/fl/java1/types
+ topics/fl/java1/types
GitHub
diff --git a/zoo/ada/kellogg-post-extract.html b/zoo/ada/kellogg-post-extract.html
index f3c27b5c..bb5d518b 100644
--- a/zoo/ada/kellogg-post-extract.html
+++ b/zoo/ada/kellogg-post-extract.html
@@ -9,7 +9,7 @@
.b { text-align: right; font-style:italic;}
all
- define (
- characters:
- character+
- );
-
- reroot (wiki-page);
-
- define (
- digits:
- digit+
- );
-
- unite (digit, decimal-digit);
-
- unite (DIGIT, decimal-digit);
-
- vertical( in image-option );
-
- addV (
- image-option:
- image-other-parameter
- );
-
- horizontal (image-option);
-
- eliminate (BlockHTML);
-
- eliminate (newlines);
-
- unite (PositiveInteger, digits);
-
- unite (PositiveNumber, digits);
-
- vertical( in text-with-formatting );
-
- removeV (
- text-with-formatting:
- open-guillemet
- );
-
- removeV (
- text-with-formatting:
- close-guillemet
- );
-
- horizontal (text-with-formatting);
-
- unite (ImageModeThumb, image-mode-auto-thumb);
-
- fold (link);
-
- unite (category, category-link);
-
- define (
- TAB:
- "\t"
- );
-
- define (
- CR:
- "\r"
- );
-
- define (
- LF:
- "\n"
- );
-
- redefine (
- random-character:
- any
- );
-
- define (
- any-text:
- unicode-character*
- );
-
- define (
- sort-key:
- any-text
- );
-
- define (
- any-supported-unicode-character:
- any
- );
-
- vertical( in TableCellParameter );
-
- removeV (
- TableCellParameter:
- ? HTML cell attributes ?
- );
-
- addV (
- TableCellParameter:
- html-cell-attributes
- );
-
- horizontal (TableCellParameter);
-
- vertical( in TableParameters );
-
- removeV (
- TableParameters:
- ? HTML table attributes ?
- );
-
- addV (
- TableParameters:
- html-table-attributes
- );
-
- horizontal (TableParameters);
-
- renameT ("<nowiki", "<nowiki");
-
- renameT ("</nowiki", "</nowiki");
-
- renameT ("<pre", "<pre");
-
- renameT ("</pre", "</pre");
-
- renameT ("<html", "<html");
-
- renameT ("</html", "</html");
-
- renameT ("<!--", "<!--");
-
- replace (
- ">",
- ">");
-
- massage (
- canonical-sub-pages?,
- (canonical-sub-pages | ε));
-
- distribute( in canonical-sub-pages );
-
- vertical( in canonical-sub-pages );
-
- deyaccify (canonical-sub-pages);
-
- inline (canonical-sub-pages);
-
- massage (
- (canonical-sub-page+ | ε),
- canonical-sub-page*);
-
- massage (
- canonical-page-chars?,
- (canonical-page-chars | ε));
-
- distribute( in canonical-page-chars );
-
- vertical( in canonical-page-chars );
-
- deyaccify (canonical-page-chars);
-
- inline (canonical-page-chars);
-
- massage (
- (canonical-page-char+ | ε),
- canonical-page-char*);
-
- massage (
- sub-pages?,
- (sub-pages | ε));
-
- distribute( in sub-pages );
-
- vertical( in sub-pages );
-
- deyaccify (sub-pages);
-
- inline (sub-pages);
-
- massage (
- (sub-page+ | ε),
- sub-page*);
-
- massage (
- page-chars?,
- (page-chars | ε));
-
- distribute( in page-chars );
-
- vertical( in page-chars );
-
- deyaccify (page-chars);
-
- inline (page-chars);
-
- massage (
- (page-char+ | ε),
- page-char*);
-
- massage (
- dashes?,
- (dashes | ε)
- in dashes);
-
- distribute( in dashes );
-
- vertical( in dashes );
-
- deyaccify (dashes);
-
- massage (
- newlines?,
- (newlines | ε)
- in newlines);
-
- distribute( in newlines );
-
- vertical( in newlines );
-
- deyaccify (newlines);
-
- massage (
- space-tabs?,
- (space-tabs | ε)
- in space-tabs);
-
- distribute( in space-tabs );
-
- vertical( in space-tabs );
-
- deyaccify (space-tabs);
-
- massage (
- spaces?,
- (spaces | ε)
- in spaces);
-
- distribute( in spaces );
-
- vertical( in spaces );
-
- deyaccify (spaces);
-
- massage (
- decimal-number?,
- (decimal-number | ε)
- in decimal-number);
-
- distribute( in decimal-number );
-
- vertical( in decimal-number );
-
- deyaccify (decimal-number);
-
- massage (
- hex-number?,
- (hex-number | ε)
- in hex-number);
-
- distribute( in hex-number );
-
- vertical( in hex-number );
-
- deyaccify (hex-number);
-
- massage (
- extra-description?,
- (extra-description | ε)
- in extra-description);
-
- distribute( in extra-description );
-
- vertical( in extra-description );
-
- deyaccify (extra-description);
-
- replace (
- ?_all_supported_Unicode_characters_?_-_Whitespaces,
- <(any-supported-unicode-character Whitespaces)>);
-
- replace (
- UnicodeCharacter_-_WikiMarkupCharacters,
- <(UnicodeCharacter WikiMarkupCharacters)>);
-
- replace (
- (SectionLinkCharacter_- "="),
- <(SectionLinkCharacter "=")>);
-
- replace (
- (UnicodeCharacter_- "]"),
- <(UnicodeCharacter "]")>);
-
- replace (
- UnicodeCharacter_-_BadTitleCharacters,
- <(UnicodeCharacter BadTitleCharacters)>);
-
- replace (
- UnicodeCharacter_-_BadSectionLinkCharacters,
- <(UnicodeCharacter BadSectionLinkCharacters)>);
-
- vertical( in special-block );
-
- project (
- special-block:
- <nowiki> table </ nowiki>
- );
-
- horizontal (special-block);
-
- renameN (title-legal-chars, title-legal-char);
-
- unite (harmless-characters, harmless-character);
-
- unite (unespaced-less-than, unescaped-less-than);
-
- unite (ImageParamUpgright, ImageParamUpright);
-
- unite (ImageValignParameter, ImageVAlignParameter);
-
- unite (TableCellParameter, TableCellParameters);
-
- replace (
- (ImageAlign | Center),
- (ImageAlignCenter));
-
- unite (noparseblock, noparse-block);
-
- unite (GalleryBlock, gallery-block);
-
- unite (ImageInline, image-inline);
-
- unite (MediaInline, media-inline);
-
- unite (Table, table);
-
- unite (Text, text);
-
- unite (InlineText, inline-text);
-
- unite (Pipe, pipe);
-
- renameN (AnyText, any-text);
-
- renameN (BadSectionLinkCharacters, bad-section-link-characters);
-
- renameN (BadTitleCharacters, bad-title-characters);
-
- renameN (Caption, caption);
-
- renameN (GalleryImage, gallery-image);
-
- renameN (ImageAlignCenter, image-align-center);
-
- renameN (ImageAlignLeft, image-align-left);
-
- renameN (ImageAlignNone, image-align-none);
-
- renameN (ImageAlignParameter, image-align-parameter);
-
- renameN (ImageAlignRight, image-align-right);
-
- renameN (ImageExtension, image-extension);
-
- renameN (ImageModeAutoThumb, image-mode-auto-thumb);
-
- renameN (ImageModeFrame, image-mode-frame);
-
- renameN (ImageModeFrameless, image-mode-frameless);
-
- renameN (ImageModeManualThumb, image-mode-manual-thumb);
-
- renameN (ImageModeParameter, image-mode-parameter);
-
- renameN (ImageName, image-name);
-
- renameN (ImageOption, image-option);
-
- renameN (ImageOtherParameter, image-other-parameter);
-
- renameN (ImageParamBorder, image-param-border);
-
- renameN (ImageParamPage, image-param-page);
-
- renameN (ImageParamUpright, image-param-upright);
-
- renameN (ImageSizeParameter, image-size-parameter);
-
- renameN (ImageValignBaseline, image-valign-baseline);
-
- renameN (ImageValignBottom, image-valign-bottom);
-
- renameN (ImageValignMiddle, image-valign-middle);
-
- renameN (ImageVAlignParameter, image-valign-parameter);
-
- renameN (ImageValignSub, image-valign-sub);
-
- renameN (ImageValignSuper, image-valign-super);
-
- renameN (ImageValignTextBottom, image-valign-text-bottom);
-
- renameN (ImageValignTextTop, image-valign-text-top);
-
- renameN (ImageValignTop, image-valign-top);
-
- renameN (Line, line);
-
- renameN (LinkTitle, link-title);
-
- renameN (MediaExtension, media-extension);
-
- renameN (PageName, page-name);
-
- renameN (PageNameLink, page-name-link);
-
- renameN (PlainText, plain-text);
-
- renameN (SectionLink, section-link);
-
- renameN (SectionLinkCharacter, section-link-character);
-
- renameN (SectionTitle, section-title);
-
- renameN (TableCellParameters, table-cell-parameters);
-
- renameN (TableColumn, table-column);
-
- renameN (TableColumnLine, table-column-line);
-
- renameN (TableColumnMultiLine, table-column-multiline);
-
- renameN (TableFirstRow, table-first-row);
-
- renameN (TableParameters, table-parameters);
-
- renameN (TableRow, table-row);
-
- renameN (TitleCharacter, title-character);
-
- renameN (UnicodeCharacter, unicode-character);
-
- renameN (UnicodeWiki, unicode-wiki);
-
- renameN (WikiMarkupCharacters, wiki-markup-characters);
-
- define (
- FROM_LANGUAGE_FILE:
- "#redirect"
- );
-
- inline (FROM_LANGUAGE_FILE);
-
- define (
- STRING_FROM_DB:
- "Wikipedia"
- );
-
- inline (STRING_FROM_DB);
-
- define (
- STRING_FROM_CONFIG:
- string
- );
-
- inline (STRING_FROM_CONFIG);
-
- define (
- NS_CATEGORY:
- "Category"
- );
-
- inline (NS_CATEGORY);
-
- define (
- ALLOWED_PROTOCOL_FROM_CONFIG:
- "http://"
- "https://"
- "ftp://"
- "ftps://"
- "mailto:"
- );
-
- inline (ALLOWED_PROTOCOL_FROM_CONFIG);
-
- unite (LEGAL_ARTICLE_ENTITY, article-title);
-
- unfold (characters in html-comment);
-
- massage (
- character+*,
- character*);
-
- massage (
- character*?,
- character*);
-
- massage (
- character*,
- character+?);
-
- fold (characters in html-comment);
-
- massage (
- space-block-2*?,
- space-block-2*);
-
- project (
- protocol:
- ALLOWED_PROTOCOL_FROM_CONFIG <(e "." g "." "http://" "," "mailto:")>
- );
-
- abstractize (
- PageName:
- TitleCharacter <","> (" "? TitleCharacter)*
- );
-
- abstractize (
- PageNameLink:
- TitleCharacter <","> ((" " | "_")? TitleCharacter)*
- );
-
- removeV (
- formatting:
- apostrophe-jungle
- );
-
- eliminate (apostrophe-jungle);
-
- vertical( in canonical-page-first-char );
-
- removeV (
- canonical-page-first-char:
- "." "." "." "?"
- );
-
- horizontal (canonical-page-first-char);
-
- vertical( in canonical-page-char );
-
- removeV (
- canonical-page-char:
- "." "." "." "?"
- );
-
- horizontal (canonical-page-char);
-
- vertical( in page-first-char );
-
- removeV (
- page-first-char:
- "." "." "." "?"
- );
-
- horizontal (page-first-char);
-
- vertical( in page-char );
-
- removeV (
- page-char:
- "." "." "." "?"
- );
-
- horizontal (page-char);
-
- vertical( in special-block );
-
- removeV (
- special-block:
- "." "." "."
- );
-
- horizontal (special-block);
-
- vertical( in text-with-formatting );
-
- removeV (
- text-with-formatting:
- more missing "?" "." "." "."
- );
-
- horizontal (text-with-formatting);
-
- vertical( in symbol );
-
- removeV (
- symbol:
- "." "." "."
- );
-
- horizontal (symbol);
-
- redefine (
- GalleryImage:
- ImageName ("|" Caption)?
- );
-
- massage (
- (nowiki-closing-tag | ε),
- nowiki-closing-tag?);
-
- massage (
- (pre-closing-tag | ε),
- pre-closing-tag?);
-
- massage (
- (html-closing-tag | ε),
- html-closing-tag?);
-
- project (
- isbn:
- "ISBN" " "+ isbn-number <("?" non-word-character "/" "\" b "/")>
- );
-
- project (
- html-entity-name:
- <(Sanitizer ":" ":" "$")> wgHtmlEntities <(case sensitive (("*" "Aacute") | "aacute" | ("." "." "." "*")))>
- );
-
- project (
- behaviourswitch-toc:
- "__TOC__" <i>
- );
-
- project (
- behaviourswitch-forcetoc:
- "__FORCETOC__" <i>
- );
-
- project (
- behaviourswitch-notoc:
- "__NOTOC__" <i>
- );
-
- project (
- behaviourswitch-noeditsection:
- "__NOEDITSECTION__" <i>
- );
-
- project (
- behaviourswitch-nogallery:
- "__NOGALLERY__" <i>
- );
-
- unite (WhiteSpaces, Whitespaces);
-
- fold (space);
-
- fold (spaces);
-
- unite (?_variants_of_spaces_?, space);
-
- unite (?_carriage_return_and_line_feed_?, newline);
-
- unite (?_carriage_return_?, CR);
-
- unite (?_line_feed_?, LF);
-
- inline (NewLine);
-
- unfold (newline in Whitespaces);
-
- fold (newline in Whitespaces);
-
- unite (?_tab_?, TAB);
-
- massage (
- (PlainText PlainText*),
- PlainText+);
-
- massage (
- (Line Line*),
- Line+);
-
- massage (
- (NewLine NewLine*),
- NewLine+);
-
- massage (
- (" " " "*),
- " "+);
-
- replace (
- (" " "+"),
- " "+);
-
- massage (
- (newline | ε),
- newline?);
-
- abstractize (
- isbn-number:
- "97" ("8" | "9") (" " | "-") <"?"> DIGIT (" " | "-") <"?"> "9"* (DIGIT | "X" | "x")
- );
-
- widen (
- (" " | "-"),
- (" " | "-")?
- in isbn-number);
-
- massage (
- (title-legal-chars | "%")?+,
- (title-legal-chars | "%")*);
-
- massage (
- (title-legal-chars | "%" | "#")?+,
- (title-legal-chars | "%" | "#")*);
-