diff --git a/lib/resource-1.0/doc/MkSynopsis.hs b/lib/resource-1.0/doc/MkSynopsis.hs index 841148324..a025feb24 100644 --- a/lib/resource-1.0/doc/MkSynopsis.hs +++ b/lib/resource-1.0/doc/MkSynopsis.hs @@ -16,7 +16,9 @@ main = do writeFile synopsis "GF Resource Grammar Library: Synopsis" append "Aarne Ranta" space - append "%!postproc(html): '(SRC=\"categories.png\")' '\\1 USEMAP=\"#categories\"'" + append "%!postproc(html): '(SRC=\"categories.png\")' '\\1 USEMAP=\"#categories\"'" + append "%!postproc(html): '#LParadigms' ''" + append "%!postproc(tex): '#LParadigms' ''" delimit $ addToolTips cs include "synopsis-intro.txt" title "Categories" @@ -30,20 +32,24 @@ main = do append "==Explanations==\n" delimit $ mkCatTable isLatex cs space - title "Syntax Rules" + title "Syntax Rules and Structural Words" space - link "Source:" syntaxAPI + link "Source 1:" syntaxAPI + space + link "Source 2:" structuralAPI space rs <- getRules syntaxAPI - delimit $ mkSplitTables True isLatex cs rs + rs2 <- getRules structuralAPI + delimit $ mkSplitTables True isLatex cs $ rs ++ rs2 space - title "Structural Words" - space - link "Source:" structuralAPI - space - rs <- rulesTable False isLatex cs structuralAPI - delimit rs +-- title "Structural Words" +-- space +-- link "Source:" structuralAPI +-- space +-- rs <- rulesTable False isLatex cs structuralAPI +-- delimit rs space + title "Lexical Paradigms" mapM_ (putParadigms isLatex cs) paradigmFiles space include "synopsis-browse.txt" @@ -108,7 +114,8 @@ getRules file = do putParadigms :: Bool -> Cats -> (String, FilePath) -> IO () putParadigms isLatex cs (lang,file) = do - title ("Paradigms for " ++ lang) + stitle ("Paradigms for " ++ lang) + append "#LParadigms" space link "source" file space @@ -126,10 +133,16 @@ inChunks i f = concat . intersperse ["\n\n"] . map f . chunks i where -- Adds a subsection header for each table. mkSplitTables :: Bool -> Bool -> Cats -> Rules -> [String] mkSplitTables hasEx isLatex cs = concatMap t . addLexicalCats cs . sortRules - where t (c, xs) = [subtitle c expl] ++ mkTable hasEx isLatex cs xs - where expl = case [e | (n,e,_) <- cs, n == c] of + where t (c, xs) = [subtitle c expl] ++ tableOrLink + where + expl = case [e | (n,e,_) <- cs, n == c] of [] -> "" e:_ -> e + tableOrLink = if null xs then parad else mkTable hasEx isLatex cs xs + parad = [ + "Lexical category, constructors given in", + "[lexical paradigms #RParadigms]." + ] mkTable :: Bool -> Bool -> Cats -> Rules -> [String] mkTable hasEx isLatex cs = inChunks chsize (\rs -> header : map (unwords . row) rs) @@ -173,6 +186,7 @@ paradigmFiles = [ append s = appendFile synopsis ('\n':s) title s = append $ "=" ++ s ++ "=" +stitle s = append $ "==" ++ s ++ "==" include s = append $ "%!include: " ++ s space = append "\n" delimit ss = mapM_ append ss @@ -221,4 +235,4 @@ showTyp cs = unwords . map f . words where c = init (tail s) isCat cat = cat `notElem` ["Str","Int"] && all (\c -> isAlphaNum c || c == '\'') cat - && isUpper (head cat) \ No newline at end of file + && isUpper (head cat) diff --git a/lib/resource-1.0/doc/synopsis.html b/lib/resource-1.0/doc/synopsis.html index 224af212d..3d17d61a2 100644 --- a/lib/resource-1.0/doc/synopsis.html +++ b/lib/resource-1.0/doc/synopsis.html @@ -18,7 +18,7 @@
Paradigms modules.
-
-Source: http://www.cs.chalmers.se/~aarne/GF/lib/resource/api/Constructors.gf
+Source 1: http://www.cs.chalmers.se/~aarne/GF/lib/resource/api/Constructors.gf
+
+Source 2: http://www.cs.chalmers.se/~aarne/GF/lib/resource/abstract/Structural.gf
+Lexical category, constructors given in +lexical paradigms. +
+Lexical category, constructors given in +lexical paradigms. +
source http://www.cs.chalmers.se/~aarne/GF/lib/resource/german/ParadigmsGer.gf
http://www.cs.chalmers.se/~aarn
-Paradigms for Italian
+Paradigms for Italian
+
source http://www.cs.chalmers.se/~aarne/GF/lib/resource/italian/ParadigmsIta.gf
@@ -4069,7 +4330,10 @@ source http://www.cs.chalmers.se/~aar
-Paradigms for Norwegian
+Paradigms for Norwegian
+
source http://www.cs.chalmers.se/~aarne/GF/lib/resource/norwegian/ParadigmsNor.gf
@@ -4313,7 +4577,10 @@ source http://www.cs.chalmers.se/~a
-Paradigms for Russian
+Paradigms for Russian
+
source http://www.cs.chalmers.se/~aarne/GF/lib/resource/russian/ParadigmsRus.gf
@@ -4553,7 +4820,10 @@ source http://www.cs.chalmers.se/~aar
-Paradigms for Spanish
+Paradigms for Spanish
+
source http://www.cs.chalmers.se/~aarne/GF/lib/resource/spanish/ParadigmsSpa.gf
@@ -4785,7 +5055,10 @@ source http://www.cs.chalmers.se/~aar
-Paradigms for Swedish
+Paradigms for Swedish
+
source http://www.cs.chalmers.se/~aarne/GF/lib/resource/swedish/ParadigmsSwe.gf