@retorquere/bibtex-parser 8.0.0 → 8.0.2

package/index.d.ts

@@ -169,7 +169,7 @@ export declare const FieldMode: {
     literallist: string[];
 };
 type ParseMode = keyof typeof FieldMode | 'literal';
-type unsupportedHandler = (node: Node, tex?: string, entry?: Entry) => string | undefined;
+type unsupportedHandler = (node: Node, tex: string, entry: Entry) => string;
 export declare function parse(input: string, options?: Options): Bibliography;
 export declare function parseAsync(input: string, options?: Options): Promise<Bibliography>;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -182,6 +182,7 @@ const FieldAction = {
     ],
 };
 const narguments = {
+    advance: 1,
     ElsevierGlyph: 1,
     bar: 1,
     bibcyr: 1,
@@ -194,8 +195,11 @@ const narguments = {
     emph: 1,
     enquote: 1,
     frac: 2,
+    hbox: 1,
     href: 2,
+    hskip: 1,
     hspace: 1,
+    ht: 1,
     mathrm: 1,
     mbox: 1,
     mkbibbold: 1,
@@ -205,6 +209,9 @@ const narguments = {
     newcommand: 2,
     noopsort: 1,
     ocirc: 1,
+    overline: 1,
+    ProvideTextCommandDefault: 2,
+    rlap: 1,
     sb: 1,
     section: 1,
     sp: 1,
@@ -225,7 +232,7 @@ const narguments = {
     url: 1,
     vphantom: 1,
     vspace: 1,
-    overline: 1,
+    wd: 1,
     // math
     'math\t_': 1,
     'math\t^': 1,
@@ -409,11 +416,14 @@ class BibTeXParser {
             return (_a = this.fallback(node, (0, unified_latex_util_print_raw_1.printRaw)(node), this.current)) !== null && _a !== void 0 ? _a : '';
         switch (node.type) {
             case 'macro':
-                throw new Error(`unhandled ${node.type} ${node.content} (${(0, unified_latex_util_print_raw_1.printRaw)(node)})`);
+                this.bib.errors.push({ error: `unhandled ${node.type} ${node.content} (${(0, unified_latex_util_print_raw_1.printRaw)(node)})`, input: (0, unified_latex_util_print_raw_1.printRaw)(node) });
+                break;
             case 'environment':
-                throw new Error(`unhandled ${node.type} ${node.env} (${(0, unified_latex_util_print_raw_1.printRaw)(node)})`);
+                this.bib.errors.push({ error: `unhandled ${node.type} ${node.env} (${(0, unified_latex_util_print_raw_1.printRaw)(node)})`, input: (0, unified_latex_util_print_raw_1.printRaw)(node) });
+                break;
             default:
-                throw new Error(`unhandled ${node.type} (${(0, unified_latex_util_print_raw_1.printRaw)(node)})`);
+                this.bib.errors.push({ error: `unhandled ${node.type} (${(0, unified_latex_util_print_raw_1.printRaw)(node)})`, input: (0, unified_latex_util_print_raw_1.printRaw)(node) });
+                break;
         }
     }
     wrap(text, tag, wrap = true) {
@@ -463,15 +473,33 @@ class BibTeXParser {
         let resolved;
         switch (node.content) {
             case 'newcommand':
+            case 'ProvideTextCommandDefault':
                 return this.registercommand(node);
+            // too complex to deal with these
+            case 'raise':
+            case 'accent':
+            case 'def':
+            case 'hss':
+            case 'ifmmode':
+            case 'makeatletter':
+            case 'makeatother':
+            case 'scriptscriptstyle':
+            case 'setbox':
+            case 'dimen':
+            case 'advance':
+                return '';
             case 'vphantom':
             case 'noopsort':
             case 'left':
             case 'right':
+            case 'ensuremath':
+            case 'wd':
+            case 'ht':
                 return '';
             case 'path':
                 return ''; // until https://github.com/siefkenj/unified-latex/issues/94 is fixed
             case 'hspace':
+            case 'hskip':
                 if (node.args && node.args.length) {
                     if ((0, unified_latex_util_print_raw_1.printRaw)(node.args).match(/^[{]?0[a-z]*$/))
                         return '';
@@ -481,12 +509,15 @@ class BibTeXParser {
             case 'overline':
             case 'bar':
                 return node.args.map(a => this.stringify(a, context)).join('').replace(/[a-z0-9]/ig, m => `${m}\u0305`);
+            // accents dealt with by preprocessor
             case 'textup':
             case 'textsc':
             case 'textrm':
             case 'texttt':
             case 'mathrm':
             case 'mbox':
+            case 'hbox':
+            case 'rlap':
                 return node.args.map(n => this.stringify(n, context)).join('');
             case 'href':
             case 'url':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retorquere/bibtex-parser",
-  "version": "8.0.0",
+  "version": "8.0.2",
   "description": "BibTeX parser",
   "main": "index.js",
   "typings": "./index.d.ts",
@@ -18,7 +18,7 @@
     "list": "tar tvf $(npm pack)",
     "prepublishOnly": "npm start",
     "abbr": "./build/abbr.py",
-    "preversion": "./console.py r && npm test && npm run abbr",
+    "preversion": "./console.py r && npm run abbr && npm run test",
     "postversion": "git push --follow-tags",
     "update-cases": "curl -s https://raw.githubusercontent.com/retorquere/zotero-better-bibtex/master/test/loaded.json | jq -r '.[] | select(test(\"\\\\.bib((la)?tex)?$\"))' | rsync -av --delete -m --files-from=- ../better-bibtex/test/fixtures/ test/better-bibtex/",
     "x-docs": "rm -rf docs temp && typedoc --name 'BibTeX parser' index.ts && touch docs/.nojekyll",
@@ -77,8 +77,8 @@
     "package.json",
     "grammar.js",
     "grammar.d.ts",
-    "chunker.d.ts",
-    "chunker.js",
+    "verbatim.d.ts",
+    "verbatim.js",
     "index.d.ts",
     "index.js",
     "jabref.d.ts",