2014-10-22 16:25:00

1 files changed, 28 insertions, 8 deletions

diff --git a/tex/context/base/publ-imp-apa.lua b/tex/context/base/publ-imp-apa.lua
index 0329208a7..5f6a1d35d 100644
--- a/tex/context/base/publ-imp-apa.lua
+++ b/tex/context/base/publ-imp-apa.lua
@@ -8,12 +8,20 @@ return {
     copyright = "ConTeXt development team",
     categories = {
         article = {
-            required = { "author", "title", "journal", "year" },
-            optional = { "volume", "number", "pages", "month", "note" },
+            required = { {"author", "editor"}, "title", "journal", "year" },
+            optional = { "volume", "number", "pages", "note", "type", "url", "doi" },
+        },
+        magazine = {
+            required = { {"author", "editor",}, "title", "journal", "year" },
+            optional = { "volume", "number", "pages", "month", "day", "note", "url", "doi" },
+        },
+        newspaper = {
+            required = { {"author", "editor",}, "title", "journal", "year" },
+            optional = { "volume", "number", "pages", "month", "day", "note", "url", "doi" },
         },
         book = {
             required = { { "author", "editor" }, "title", "publisher", "year" },
-            optional = { { "volume", "number" }, "series", "address", "edition", "month","note" },
+            optional = { { "volume", "number" }, "series", "address", "edition", "month", "note", "pages", "ISBN" },
         },
         booklet = {
             required = { "title" },
@@ -21,16 +29,18 @@ return {
         },
         inbook = {
             required = { { "author", "editor" }, "title", { "chapter", "pages" }, "publisher","year" },
-            optional = { { "volume", "number" }, "series", "type", "address", "edition", "month", "note" },
+            optional = { { "volume", "number" }, "series", "type", "address", "edition", "month", "note", "ISBN" },
         },
         incollection = {
             required = { "author", "title", "booktitle", "publisher", "year" },
-            optional = { "editor", { "volume", "number" }, "series", "type", "chapter", "pages", "address", "edition", "month", "note" },
+            optional = { "editor", { "volume", "number" }, "series", "type", "chapter", "pages", "address", "edition", "month", "note", "ISBN" },
         },
         inproceedings = {
             required = { "author", "title", "booktitle", "year" },
-            optional = { "editor", { "volume", "number" }, "series", "pages", "address", "month","organization", "publisher", "note" },
+            optional = { "editor", { "volume", "number" }, "series", "pages", "address", "month", "organization", "publisher", "note", "ISBN" },
         },
+        -- does this work:
+        conference = inproceedings,
         manual = {
             required = { "title" },
             optional = { "author", "organization", "address", "edition", "month", "year", "note" },
@@ -40,16 +50,22 @@ return {
             optional = { "type", "address", "month", "note" },
         },
         misc = {
-            required = { "author", "title", "howpublished", "month", "year", "note" },
+            required = { },
             optional = { "author", "title", "howpublished", "month", "year", "note" },
         },
+        -- Not sure yet how "periodical" is used... but "jabref" includes it as standard.
+        -- strangely, "jabref" does not include "author" as required nor optional..
+        periodical = {
+            required = { "title", "year" },
+            optional = { "author", "editor", "month", "note", "number", "organization", "series", "volume" },
+        },
         phdthesis = {
             required = { "author", "title", "school", "year" },
             optional = { "type", "address", "month", "note" },
         },
         proceedings = {
             required = { "title", "year" },
-            optional = { "editor", { "volume", "number" }, "series", "address", "month", "organization", "publisher", "note" },
+            optional = { "editor", { "volume", "number" }, "series", "address", "month", "organization", "publisher", "note", "pages", "ISBN" },
         },
         techreport = {
             required = { "author", "title", "institution", "year" },
@@ -63,6 +79,10 @@ return {
             required = { "author", "title", "note" },
             optional = { "month", "year" },
         },
+        literal = {
+            required = { "key", "text", },
+            optional = { },
+        },
     },
 }