From b818a885781844c1497249071559777a48c5b033 Mon Sep 17 00:00:00 2001 From: grammarware Date: Sat, 23 Jul 2011 07:27:59 +0000 Subject: [PATCH] meta-massage git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@1105 ab42f6e0-554d-0410-b580-99e487e6eeb2 --- topics/grammars/wiki/mediawiki-bnf/Makefile | 28 +++-- .../wiki/mediawiki-bnf/connect-grammar.xbgf | 81 +++++-------- .../wiki/mediawiki-bnf/define-lexicals.xbgf | 17 +-- .../mediawiki-bnf/define-special-symbols.xbgf | 70 ++++++++++++ .../wiki/mediawiki-bnf/fix-names.xbgf | 106 +++--------------- .../wiki/mediawiki-bnf/unify-whitespace.xbgf | 30 ++++- ...lise-plus.xbgf => utilise-repetition.xbgf} | 76 +++++++++++++ .../wiki/mediawiki-bnf/utilise-star.xbgf | 79 ------------- 8 files changed, 240 insertions(+), 247 deletions(-) rename topics/grammars/wiki/mediawiki-bnf/{utilise-plus.xbgf => utilise-repetition.xbgf} (59%) delete mode 100644 topics/grammars/wiki/mediawiki-bnf/utilise-star.xbgf diff --git a/topics/grammars/wiki/mediawiki-bnf/Makefile b/topics/grammars/wiki/mediawiki-bnf/Makefile index 0a688518..b7482aed 100644 --- a/topics/grammars/wiki/mediawiki-bnf/Makefile +++ b/topics/grammars/wiki/mediawiki-bnf/Makefile @@ -10,7 +10,7 @@ extract: ${tooldir}/mergebgf raw.1.bgf raw.2.bgf raw.3.bgf raw.4.bgf raw.5.bgf ext.01.bgf - ${tooldir}/xbgf utilise-plus.xbgf ext.01.bgf ext.02.bgf + ${tooldir}/xbgf utilise-repetition.xbgf ext.01.bgf ext.02.bgf ${tooldir}/xbgf remove-concatenation.xbgf ext.02.bgf ext.03.bgf ${tooldir}/xbgf remove-extension-points.xbgf ext.03.bgf ext.04.bgf ${tooldir}/xbgf remove-php-legacy.xbgf ext.04.bgf ext.05.bgf @@ -20,24 +20,22 @@ extract: ${tooldir}/xbgf remove-duplicates.xbgf ext.08.bgf ext.09.bgf ${tooldir}/xbgf dehtmlify.xbgf ext.09.bgf ext.10.bgf ${tooldir}/xbgf utilise-question.xbgf ext.10.bgf ext.11.bgf - ${tooldir}/xbgf utilise-star.xbgf ext.11.bgf ext.12.bgf - ${tooldir}/xbgf fix-markup.xbgf ext.12.bgf ext.13.bgf - ${tooldir}/xbgf define-special-symbols.xbgf ext.13.bgf ext.14.bgf - ${tooldir}/xbgf fake-exclusion.xbgf ext.14.bgf ext.15.bgf - ${tooldir}/xbgf remove-postfix-case.xbgf ext.15.bgf ext.16.bgf - ${tooldir}/xbgf fix-names.xbgf ext.16.bgf ext.17.bgf - ${tooldir}/xbgf unify-whitespace.xbgf ext.17.bgf ext.18.bgf - ${tooldir}/xbgf connect-grammar.xbgf ext.18.bgf ext.19.bgf - ${tooldir}/xbgf refactor-repetition.xbgf ext.19.bgf ext.20.bgf - ${tooldir}/xbgf define-lexicals.xbgf ext.20.bgf ext.21.bgf + ${tooldir}/xbgf fix-markup.xbgf ext.11.bgf ext.12.bgf + ${tooldir}/xbgf define-special-symbols.xbgf ext.12.bgf ext.13.bgf + ${tooldir}/xbgf fake-exclusion.xbgf ext.13.bgf ext.14.bgf + ${tooldir}/xbgf remove-postfix-case.xbgf ext.14.bgf ext.15.bgf + ${tooldir}/xbgf fix-names.xbgf ext.15.bgf ext.16.bgf + ${tooldir}/xbgf unify-whitespace.xbgf ext.16.bgf ext.17.bgf + ${tooldir}/xbgf connect-grammar.xbgf ext.17.bgf ext.18.bgf + ${tooldir}/xbgf refactor-repetition.xbgf ext.18.bgf ext.19.bgf + ${tooldir}/xbgf define-lexicals.xbgf ext.19.bgf ext.20.bgf - ${hunter} mediawiki.config.wiki plain.edd add.bgf - ${tooldir}/mergebgf ext.21.bgf add.bgf ext.22.bgf - ${tooldir}/subgrammar ext.21.bgf wiki-page grammar.bgf + #${hunter} mediawiki.config.wiki plain.edd add.bgf + #${tooldir}/mergebgf ext.21.bgf add.bgf ext.22.bgf + ${tooldir}/subgrammar ext.20.bgf wiki-page grammar.bgf ${tooldir}/bgf2html grammar.bgf view.html ${tooldir}/checkbgf grammar.bgf - ${tooldir}/checkbgf ext.01.bgf plot: ${tooldir}/bgf2dot grammar.bgf grammar.dot diff --git a/topics/grammars/wiki/mediawiki-bnf/connect-grammar.xbgf b/topics/grammars/wiki/mediawiki-bnf/connect-grammar.xbgf index 8fd2df53..fca97079 100644 --- a/topics/grammars/wiki/mediawiki-bnf/connect-grammar.xbgf +++ b/topics/grammars/wiki/mediawiki-bnf/connect-grammar.xbgf @@ -1,5 +1,9 @@ + + + BlockHTML + @@ -13,10 +17,23 @@ - - - wiki-page - + + + image-option + + + + + image-option + + image-other-parameter + + + + + + image-option + @@ -38,29 +55,6 @@ DIGIT decimal-digit - - - image-option - - - - - image-option - - image-other-parameter - - - - - - image-option - - - BlockHTML - - - newlines - - - text-with-formatting - - - - - text-with-formatting - - open-guillemet - - - - - - - - text-with-formatting - - close-guillemet - - - - - - text-with-formatting - + + + newlines + ImageModeThumb diff --git a/topics/grammars/wiki/mediawiki-bnf/define-lexicals.xbgf b/topics/grammars/wiki/mediawiki-bnf/define-lexicals.xbgf index 4ef127cd..b26fb8ca 100644 --- a/topics/grammars/wiki/mediawiki-bnf/define-lexicals.xbgf +++ b/topics/grammars/wiki/mediawiki-bnf/define-lexicals.xbgf @@ -1,5 +1,14 @@ + + + + random-character + + + + + @@ -26,14 +35,6 @@ - - - random-character - - - - - any-text diff --git a/topics/grammars/wiki/mediawiki-bnf/define-special-symbols.xbgf b/topics/grammars/wiki/mediawiki-bnf/define-special-symbols.xbgf index 9ad1a5bd..11a6b666 100644 --- a/topics/grammars/wiki/mediawiki-bnf/define-special-symbols.xbgf +++ b/topics/grammars/wiki/mediawiki-bnf/define-special-symbols.xbgf @@ -87,4 +87,74 @@ TableParameters + + + + FROM_LANGUAGE_FILE + + #redirect + + + + FROM_LANGUAGE_FILE + + + STRING_FROM_DB + + Wikipedia + + + + STRING_FROM_DB + + + + STRING_FROM_CONFIG + + string + + + + STRING_FROM_CONFIG + + + + NS_CATEGORY + + Category + + + + NS_CATEGORY + + + + ALLOWED_PROTOCOL_FROM_CONFIG + + + + http:// + + + https:// + + + ftp:// + + + ftps:// + + + mailto: + + + + + + ALLOWED_PROTOCOL_FROM_CONFIG + + + LEGAL_ARTICLE_ENTITY + article-title + diff --git a/topics/grammars/wiki/mediawiki-bnf/fix-names.xbgf b/topics/grammars/wiki/mediawiki-bnf/fix-names.xbgf index 8227d0a2..ff630569 100644 --- a/topics/grammars/wiki/mediawiki-bnf/fix-names.xbgf +++ b/topics/grammars/wiki/mediawiki-bnf/fix-names.xbgf @@ -1,32 +1,20 @@ + title-legal-chars title-legal-char - - harmless-characters - harmless-character - - - - unespaced-less-than - unescaped-less-than - - - ImageParamUpgright - ImageParamUpright - - - ImageValignParameter - ImageVAlignParameter - TableCellParameter TableCellParameters + + harmless-characters + harmless-character + @@ -47,6 +35,19 @@ + + + unespaced-less-than + unescaped-less-than + + + ImageParamUpgright + ImageParamUpright + + + ImageValignParameter + ImageVAlignParameter + noparseblock @@ -393,75 +394,4 @@ wiki-markup-characters - - - - FROM_LANGUAGE_FILE - - #redirect - - - - FROM_LANGUAGE_FILE - - - STRING_FROM_DB - - Wikipedia - - - - STRING_FROM_DB - - - - STRING_FROM_CONFIG - - string - - - - STRING_FROM_CONFIG - - - - NS_CATEGORY - - Category - - - - NS_CATEGORY - - - - ALLOWED_PROTOCOL_FROM_CONFIG - - - - http:// - - - https:// - - - ftp:// - - - ftps:// - - - mailto: - - - - - - ALLOWED_PROTOCOL_FROM_CONFIG - - - LEGAL_ARTICLE_ENTITY - article-title - - diff --git a/topics/grammars/wiki/mediawiki-bnf/unify-whitespace.xbgf b/topics/grammars/wiki/mediawiki-bnf/unify-whitespace.xbgf index 87503f7f..5c195fe2 100644 --- a/topics/grammars/wiki/mediawiki-bnf/unify-whitespace.xbgf +++ b/topics/grammars/wiki/mediawiki-bnf/unify-whitespace.xbgf @@ -17,7 +17,6 @@ ?_variants_of_spaces_? space - ?_carriage_return_and_line_feed_? @@ -50,4 +49,33 @@ ?_tab_? TAB + + + text-with-formatting + + + + + text-with-formatting + + open-guillemet + + + + + + + + text-with-formatting + + close-guillemet + + + + + + text-with-formatting + diff --git a/topics/grammars/wiki/mediawiki-bnf/utilise-plus.xbgf b/topics/grammars/wiki/mediawiki-bnf/utilise-repetition.xbgf similarity index 59% rename from topics/grammars/wiki/mediawiki-bnf/utilise-plus.xbgf rename to topics/grammars/wiki/mediawiki-bnf/utilise-repetition.xbgf index b72aa1de..28d8e32e 100644 --- a/topics/grammars/wiki/mediawiki-bnf/utilise-plus.xbgf +++ b/topics/grammars/wiki/mediawiki-bnf/utilise-repetition.xbgf @@ -116,4 +116,80 @@ + + + + + + + + + + title-legal-chars + + + % + + + + + + + + + + + + + title-legal-chars + + + % + + + + + + + + + + + + + + + + title-legal-chars + + + % + + + # + + + + + + + + + + + + + title-legal-chars + + + % + + + # + + + + + + diff --git a/topics/grammars/wiki/mediawiki-bnf/utilise-star.xbgf b/topics/grammars/wiki/mediawiki-bnf/utilise-star.xbgf deleted file mode 100644 index a67f60c6..00000000 --- a/topics/grammars/wiki/mediawiki-bnf/utilise-star.xbgf +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - title-legal-chars - - - % - - - - - - - - - - - - - title-legal-chars - - - % - - - - - - - - - - - - - - - - title-legal-chars - - - % - - - # - - - - - - - - - - - - - title-legal-chars - - - % - - - # - - - - - - -