Merge branch 'dev'

# Conflicts:
#	docs/css/lxmlweb.css
#	docs/index.html
#	docs/lib/jquery.min.js
#	docs/lxmlconverter.js
#	web/Makefile
#	web/package-lock.json
#	web/package.json
#	web/src/converter.ts
#	web/src/main.ts
#	web/src/tsconfig.json

.github/workflows/macos.yml

@@ -0,0 +1,29 @@
+# This is a basic workflow to help you get started with Actions
+
+name: MacOS
+
+# Controls when the action will run. 
+on:
+  # Triggers the workflow on push or pull request events but only for the dev branch
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ dev ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: macos-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Build libmusicxml
+        run: make -C build

.github/workflows/ubuntu.yml

@@ -0,0 +1,29 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Ubuntu
+
+# Controls when the action will run. 
+on:
+  # Triggers the workflow on push or pull request events but only for the dev branch
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ dev ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Build libmusicxml
+        run: make -C build 

.github/workflows/windows.yml

@@ -0,0 +1,32 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Windows
+
+# Controls when the action will run. 
+on:
+  # Triggers the workflow on push or pull request events but only for the dev branch
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ dev ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: windows-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@latest
+
+      - name: Build libmusicxml
+        run: make -C build

CHANGELOG.txt

@@ -1,6 +1,35 @@
 MusicXML Library
 
 
+----------------------------------------------------------------------------------------------------
+Version 3.21
+- xml2guido v.3.2: 
+	- Support for Pedal, non-wavy trills tags
+	- Major improvements to Octava, Xml Directions, Fingerings, Wedge, Slurs, Beaming and other 
+	  articulation parsing especially for multi-voice scores
+	- Improvements to horizontal positioning of elements following MusicXML TimePositions
+	- Support for Partial generation of Guido Scores from MusicXML
+	- Updates for latest GuidoLib Release
+    Note: iOS Builds now use frameworks as it has (re)become industry standard via XCFramework since 2021.
+
+
+----------------------------------------------------------------------------------------------------
+Version 3.20
+- xml2guido v.3.1: 
+	- Fix Accolade and barformat inference
+	- Removes default staffFormat distance inference as MusicXML is not consistent
+	- Adds Font-size and Sound element conditions to infer Tempo Markup
+	- Improves staff-Distance parsing
+	- Fixed Octava Parsing for Guido
+	- Adds support for Staccatissimo and SnapPizzicato
+	- Fixed y-pos inference from XML for Fermata and other articulations (Fingering etc.)
+	- Adds Guido Fingering Support on Chords
+	- Evade Slur generation for multi-voice slurs in XML
+	- Improved grouping detection for Guido Beaming (especially nested beams)
+	- Fixed ordering of grace notte tag creation
+	- Ability tto parse nested Ties with correct sequencing in Guido
+
+
 ----------------------------------------------------------------------------------------------------
 Version 3.19
 - fix parsing bug with comments after DOCTYPE