@retorquere/bibtex-parser 6.3.11 → 6.4.1

package/index.d.ts

@@ -1,7 +1,7 @@
 import * as bibtex from './grammar';
 import { JabRefMetadata } from './jabref';
 export declare function toSentenceCase(text: string, ignoreHTML?: boolean): string;
-declare type Node = bibtex.Bibliography | bibtex.Math | bibtex.Environment | bibtex.Block | bibtex.RegularCommand | bibtex.DiacriticCommand | bibtex.Entry | bibtex.Field | bibtex.NumberValue | bibtex.StringDeclaration | bibtex.StringReference | bibtex.SubscriptCommand | bibtex.SuperscriptCommand | bibtex.SymbolCommand | bibtex.TextValue | bibtex.PreambleExpression | bibtex.BracedComment | bibtex.LineComment | bibtex.Markup | bibtex.NonEntryText;
+type Node = bibtex.Bibliography | bibtex.Math | bibtex.Environment | bibtex.Block | bibtex.RegularCommand | bibtex.DiacriticCommand | bibtex.Entry | bibtex.Field | bibtex.NumberValue | bibtex.StringDeclaration | bibtex.StringReference | bibtex.SubscriptCommand | bibtex.SuperscriptCommand | bibtex.SymbolCommand | bibtex.TextValue | bibtex.PreambleExpression | bibtex.BracedComment | bibtex.LineComment | bibtex.Markup | bibtex.NonEntryText;
 export interface Name {
     /**
      * If the name is a literal (surrounded by braces) it will be in this property, and none of the other properties will be set
@@ -230,8 +230,8 @@ export interface ParserOptions {
      */
     verbatimCommands?: string[];
     /**
-     * In the past many bibtex entries would just always wrap a field in double braces ({{ title here }}), likely because whomever was writing them couldn't figure out the case meddling rules (and who could
-     * blame them. Fields listed here will either have one outer layer of braces treated as case-preserve, or have the outer braced be ignored completely, if this is detected.
+     * In the past many bibtex entries would just always wrap a field in double braces, likely because whomever was writing them couldn't figure out the case meddling rules (and who could
+     * blame them). Fields listed here will either have one outer layer of braces treated as case-preserve, or have the outer braced be ignored completely, if this is detected.
      */
     unnestFields?: string[];
     unnestMode?: 'preserve' | 'unwrap';

package/index.js

@@ -586,9 +586,16 @@ class Parser {
         }
         return false;
     }
+    isBreak(node, kind) {
+        return node && node.kind === 'RegularCommand' && kind.includes(node.command);
+    }
     clean(node) {
-        if (Array.isArray(node))
-            return node.map(child => this.clean(child)); // eslint-disable-line @typescript-eslint/no-unsafe-return
+        if (Array.isArray(node)) {
+            return node
+                .filter((child, i) => !(this.isBreak(child, ['\\']) && this.isBreak(node[i - 1], ['\\', 'par']))) // condense linebreaks
+                .filter((child, i) => !this.isBreak(child, ['par']) || !this.isBreak(node[i - 1], ['par'])) // condense parbreaks
+                .map(child => this.clean(child)); // eslint-disable-line @typescript-eslint/no-unsafe-return
+        }
         delete node.loc;
         switch (node.kind) {
             case 'InlineMath':
@@ -623,6 +630,7 @@ class Parser {
             case 'Text':
             case 'BracedComment':
             case 'LineComment':
+            case 'NonEntryText':
                 return node;
             default:
                 return this.error(new ParserError(`no cleanup method for ${this.show(node)}`, node), this.text());
@@ -985,7 +993,8 @@ class Parser {
             case 'right':
                 return this.text();
             case 'par':
-                return this.text('\n\n');
+            case '\\':
+                return node;
             case 'cyr':
                 if (this.argument(node, 'none'))
                     return this.text();
@@ -1151,6 +1160,12 @@ class Parser {
                 if (node.kind === 'RegularCommand' && node.command === 'href') {
                     this.convert_href(node);
                 }
+                else if (node.kind === 'RegularCommand' && node.command === 'par') {
+                    this.field.text += this.field.html ? '<p>\n' : ' ';
+                }
+                else if (node.kind === 'RegularCommand' && node.command === '\\') {
+                    this.field.text += this.field.html ? '<b>\n' : ' ';
+                }
                 else {
                     return this.error(new ParserError(`no converter for ${node.kind}: ${this.show(node)}`, node));
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retorquere/bibtex-parser",
-  "version": "6.3.11",
+  "version": "6.4.1",
   "description": "BibTeX parser",
   "main": "index.js",
   "scripts": {
@@ -32,27 +32,27 @@
   "author": "Emiliano Heyns",
   "license": "ISC",
   "devDependencies": {
-    "@types/node": "^18.11.7",
-    "@typescript-eslint/eslint-plugin": "^5.41.0",
-    "@typescript-eslint/parser": "^5.41.0",
+    "@types/node": "^18.11.18",
+    "@typescript-eslint/eslint-plugin": "^5.48.0",
+    "@typescript-eslint/parser": "^5.48.0",
     "command-line-args": "^5.2.1",
-    "csv": "^6.2.1",
+    "csv": "^6.2.5",
     "digital-tree": "^2.0.4",
     "ejs": "^3.1.8",
-    "eslint": "^8.26.0",
+    "eslint": "^8.31.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "glob": "^8.0.3",
     "mkdirp": "^1.0.4",
-    "node-fetch": "^3.2.10",
+    "node-fetch": "^3.3.0",
     "peggy": "^2.0.1",
     "piscina": "^3.2.0",
     "slug": "^8.2.2",
-    "tap": "^16.3.0",
+    "tap": "^16.3.2",
     "ts-node": "^10.9.1",
-    "tslib": "^2.4.0",
-    "typedoc": "^0.23.19",
-    "typescript": "^4.8.4"
+    "tslib": "^2.4.1",
+    "typedoc": "^0.23.23",
+    "typescript": "^4.9.4"
   },
   "dependencies": {
     "unicode2latex": "^3.0.0",