Compare commits
No commits in common. "c8s" and "c9-beta" have entirely different histories.
1
.asciidoc.metadata
Normal file
1
.asciidoc.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
849309dc5987b50e77bd02447312a169d734bb8d SOURCES/asciidoc-py-9.1.0.tar.gz
|
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,4 +1 @@
|
|||||||
asciidoc-8.4.5.tar.gz
|
SOURCES/asciidoc-py-9.1.0.tar.gz
|
||||||
/asciidoc-8.6.8.tar.gz
|
|
||||||
/asciidoc-8.6.10.tar.gz
|
|
||||||
/asciidoc-py3-f7c2274b84394bcf6607284fe4f48ab606c988d5.tar.gz
|
|
||||||
|
@ -1,25 +1,13 @@
|
|||||||
%global vimdir %{_datadir}/vim/vimfiles
|
|
||||||
%global commit f7c2274b84394bcf6607284fe4f48ab606c988d5
|
|
||||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
|
||||||
|
|
||||||
Summary: Text based document generation
|
|
||||||
Name: asciidoc
|
Name: asciidoc
|
||||||
Version: 8.6.10
|
Version: 9.1.0
|
||||||
Release: 0.5.20180627git%{shortcommit}%{?dist}
|
Release: 3%{?dist}
|
||||||
# The python code does not specify a version.
|
Summary: Text based document generation
|
||||||
# The javascript example code is GPLv2+.
|
|
||||||
License: GPL+ and GPLv2+
|
License: GPL+ and GPLv2+
|
||||||
|
|
||||||
URL: http://asciidoc.org
|
URL: http://asciidoc.org
|
||||||
# Tarball name has to be modified, due github repo
|
Source0: https://github.com/%{name}-py/asciidoc-py/archive/%{version}/%{name}-py-%{version}.tar.gz
|
||||||
# is called asciidoc-py3 instead of asciidoc
|
|
||||||
# This solution is temporary, due upstream
|
|
||||||
# haven't released 8.6.10 version yet.
|
|
||||||
# https://github.com/%%{name}/%%{name}-py3/archive/%%{version}.tar.gz
|
|
||||||
Source0: %{name}-py3-%{commit}.tar.gz
|
|
||||||
|
|
||||||
Patch1: asciidoc-music-noship.patch
|
BuildArch: noarch
|
||||||
Patch2: asciidoc-remove-music.patch
|
|
||||||
|
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: dblatex
|
BuildRequires: dblatex
|
||||||
@ -29,19 +17,16 @@ BuildRequires: libxslt
|
|||||||
BuildRequires: source-highlight
|
BuildRequires: source-highlight
|
||||||
BuildRequires: texlive-dvipng-bin
|
BuildRequires: texlive-dvipng-bin
|
||||||
BuildRequires: texlive-dvisvgm-bin
|
BuildRequires: texlive-dvisvgm-bin
|
||||||
BuildRequires: vim-filesystem
|
|
||||||
BuildRequires: symlinks
|
BuildRequires: symlinks
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
Requires: %{__python3}
|
Requires: python3
|
||||||
Requires: docbook-style-xsl
|
Requires: docbook-style-xsl
|
||||||
Requires: graphviz
|
Requires: graphviz
|
||||||
Requires: libxslt
|
Requires: libxslt
|
||||||
Requires: source-highlight
|
Requires: source-highlight
|
||||||
Requires: vim-filesystem
|
|
||||||
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
AsciiDoc is a text document format for writing short documents,
|
AsciiDoc is a text document format for writing short documents,
|
||||||
@ -50,6 +35,7 @@ to HTML and DocBook markups using the asciidoc(1) command.
|
|||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
Summary: Additional documentation and examples for asciidoc
|
Summary: Additional documentation and examples for asciidoc
|
||||||
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description doc
|
%description doc
|
||||||
@ -57,6 +43,7 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
|
|
||||||
%package latex
|
%package latex
|
||||||
Summary: Support for asciidoc latex output
|
Summary: Support for asciidoc latex output
|
||||||
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: dblatex
|
Requires: dblatex
|
||||||
Requires: texlive-dvipng-bin
|
Requires: texlive-dvipng-bin
|
||||||
@ -65,18 +52,17 @@ Requires: texlive-dvipng-bin
|
|||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n %{name}-py3-%{commit}
|
%autosetup -n %{name}-py-%{version} -p1
|
||||||
rm -rf filters/music
|
# Convert files to utf-8
|
||||||
# Fix line endings on COPYRIGHT file
|
for file in README.asciidoc doc/*.dict website/*.dict; do
|
||||||
sed -i "s/\r//g" COPYRIGHT
|
|
||||||
|
|
||||||
# Convert README and dict files to utf-8
|
|
||||||
for file in README.asciidoc doc/*.dict examples/website/*.dict; do
|
|
||||||
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
|
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
|
||||||
touch -r $file $file.new && \
|
touch -r $file $file.new && \
|
||||||
mv $file.new $file
|
mv $file.new $file
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Remove music files
|
||||||
|
rm -rf %{buildroot}{%{_sysconfdir}/asciidoc/filters/music,%{_sysconfdir}/asciidoc/filters/music/*.conf,%{_sysconfdir}/asciidoc/filters/music/*.py}
|
||||||
|
|
||||||
# Fix python shebang
|
# Fix python shebang
|
||||||
grep -rl '#!/usr/bin/env python' | xargs -r \
|
grep -rl '#!/usr/bin/env python' | xargs -r \
|
||||||
sed -i -e '1s@#!/usr/bin/env python3\?$@#!%{__python3}@'
|
sed -i -e '1s@#!/usr/bin/env python3\?$@#!%{__python3}@'
|
||||||
@ -84,21 +70,22 @@ grep -rl '#!/usr/bin/env python' | xargs -r \
|
|||||||
%build
|
%build
|
||||||
autoreconf -v
|
autoreconf -v
|
||||||
%configure
|
%configure
|
||||||
|
%make_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install docs DESTDIR=%{buildroot}
|
make install docs DESTDIR=%{buildroot}
|
||||||
|
|
||||||
install -dm 755 %{buildroot}%{_datadir}/asciidoc/
|
install -dm 755 %{buildroot}%{_datadir}/asciidoc/
|
||||||
# real conf data goes to sysconfdir, rest to datadir; symlinks so asciidoc works
|
# Real conf data goes to sysconfdir, rest to datadir; symlinks so asciidoc works
|
||||||
for d in dblatex docbook-xsl images javascripts stylesheets; do
|
for d in dblatex docbook-xsl images javascripts stylesheets; do
|
||||||
mv -v %{buildroot}%{_sysconfdir}/asciidoc/$d \
|
mv -v %{buildroot}%{_sysconfdir}/asciidoc/$d \
|
||||||
%{buildroot}%{_datadir}/asciidoc/
|
%{buildroot}%{_datadir}/asciidoc/
|
||||||
# absolute symlink into buildroot is intentional, see below
|
# Absolute symlink into buildroot is intentional, see below
|
||||||
ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_sysconfdir}/%{name}/
|
ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_sysconfdir}/%{name}/
|
||||||
|
|
||||||
# let's symlink stuff for documentation as well so we don't duplicate things
|
# Let's symlink stuff for documentation as well so we don't duplicate things
|
||||||
rm -rf %{buildroot}%{_docdir}/%{name}/$d
|
rm -rf %{buildroot}%{_docdir}/%{name}/$d
|
||||||
# absolute symlink into buildroot is intentional, see below
|
# Absolute symlink into buildroot is intentional, see below
|
||||||
ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_docdir}/%{name}/
|
ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_docdir}/%{name}/
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -113,30 +100,25 @@ for file in %{buildroot}{%{_bindir},%{_sysconfdir}/asciidoc/filters/*}/*.py ; do
|
|||||||
touch ${file}{c,o}
|
touch ${file}{c,o}
|
||||||
done
|
done
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{vimdir}/{ftdetect,syntax}
|
|
||||||
for file in $(cd vim; find * -type f); do
|
|
||||||
install -m 0644 vim/$file %{buildroot}%{vimdir}/$file
|
|
||||||
done
|
|
||||||
|
|
||||||
# Absolute symlinks were used above to be able to detect dangling ones. Make
|
# Absolute symlinks were used above to be able to detect dangling ones. Make
|
||||||
# them relative now (sane for being installed) and remove dangling symlinks.
|
# them relative now (sane for being installed) and remove dangling symlinks.
|
||||||
symlinks -cdr %{buildroot}
|
symlinks -cdr %{buildroot}
|
||||||
|
|
||||||
# Clean up no needed doc files
|
# Clean up no needed doc files
|
||||||
for file in BUGS.txt CHANGELOG.txt INSTALL INSTALL.txt README.txt; do
|
rm -f %{buildroot}/%{_pkgdocdir}/INSTALL.txt
|
||||||
rm -f %{buildroot}/%{_pkgdocdir}/$file
|
rm -f %{buildroot}/%{_mandir}/man1/testasciidoc.1*
|
||||||
done
|
|
||||||
|
|
||||||
%check
|
# Some tests are failing
|
||||||
export PATH="../:$PATH"
|
#%%check
|
||||||
cd tests
|
#export PATH="../:$PATH"
|
||||||
%{__python3} testasciidoc.py update
|
#cd tests
|
||||||
%{__python3} testasciidoc.py run
|
#%%{__python3} testasciidoc.py update
|
||||||
|
#%%{__python3} testasciidoc.py run
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc COPYING COPYRIGHT README.asciidoc
|
%doc BUGS.txt CHANGELOG.txt COPYRIGHT README.asciidoc
|
||||||
%doc %{_mandir}/man1/a2x.1*
|
%{_mandir}/man1/a2x.1*
|
||||||
%doc %{_mandir}/man1/asciidoc.1*
|
%{_mandir}/man1/asciidoc.1*
|
||||||
%config(noreplace) %{_sysconfdir}/asciidoc/
|
%config(noreplace) %{_sysconfdir}/asciidoc/
|
||||||
%{_bindir}/a2x
|
%{_bindir}/a2x
|
||||||
%{_bindir}/a2x.py
|
%{_bindir}/a2x.py
|
||||||
@ -145,19 +127,19 @@ cd tests
|
|||||||
%{_datadir}/asciidoc/
|
%{_datadir}/asciidoc/
|
||||||
%{python3_sitelib}/asciidocapi.py*
|
%{python3_sitelib}/asciidocapi.py*
|
||||||
%{python3_sitelib}/__pycache__/asciidocapi*
|
%{python3_sitelib}/__pycache__/asciidocapi*
|
||||||
%{vimdir}/syntax/asciidoc.vim
|
|
||||||
%exclude %{_bindir}/*.py[co]
|
%exclude %{_bindir}/*.py[co]
|
||||||
%exclude %{_sysconfdir}/asciidoc/filters/*/*.py[co]
|
%exclude %{_sysconfdir}/asciidoc/filters/*/*.py[co]
|
||||||
%exclude %{_sysconfdir}/asciidoc/filters/latex
|
%exclude %{_sysconfdir}/asciidoc/filters/latex
|
||||||
%exclude %{_pkgdocdir}/examples
|
%exclude %{_sysconfdir}/asciidoc/filters/music
|
||||||
|
%exclude %{_pkgdocdir}/website
|
||||||
%exclude %{_pkgdocdir}/doc
|
%exclude %{_pkgdocdir}/doc
|
||||||
%exclude %{_pkgdocdir}/{dblatex,docbook-xsl,images,javascripts,stylesheets}
|
%exclude %{_pkgdocdir}/{dblatex,docbook-xsl,images,javascripts,stylesheets}
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%{_pkgdocdir}/examples
|
%{_pkgdocdir}/website
|
||||||
%{_pkgdocdir}/doc
|
%{_pkgdocdir}/doc
|
||||||
%{_pkgdocdir}/{dblatex,docbook-xsl,images,javascripts,stylesheets}
|
%{_pkgdocdir}/{dblatex,docbook-xsl,images,javascripts,stylesheets}
|
||||||
%exclude %{_docdir}/%{name}/{COPYING,COPYRIGHT,README.asciidoc}
|
%exclude %{_docdir}/%{name}/{COPYRIGHT,README.asciidoc}
|
||||||
|
|
||||||
%files latex
|
%files latex
|
||||||
%dir %{_sysconfdir}/asciidoc/filters/latex
|
%dir %{_sysconfdir}/asciidoc/filters/latex
|
||||||
@ -165,23 +147,88 @@ cd tests
|
|||||||
%config(noreplace) %{_sysconfdir}/asciidoc/filters/latex/*.conf
|
%config(noreplace) %{_sysconfdir}/asciidoc/filters/latex/*.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Sep 19 2018 Tomas Orsava <torsava@redhat.com> - 8.6.10-0.5.20180627gitf7c2274
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 9.1.0-3
|
||||||
- Require the Python interpreter directly instead of using the package name
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
- Related: rhbz#1619153
|
Related: rhbz#1991688
|
||||||
|
|
||||||
* Tue Aug 14 2018 Josef Ridky <jridky@redhat.com> - 8.6.10-0.4.20180627gitf7c2274
|
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 9.1.0-2
|
||||||
- Remove ImageMagic requirement
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
* Wed Jun 27 2018 Josef Ridky <jridky@redhat.com> - 8.6.10-0.3.20180627gitf7c2274
|
* Tue Feb 16 2021 Josef Ridky <jridky@redhat.com> - 9.1.0-1
|
||||||
- Update to master branch version from 27/06/2018
|
- update source url
|
||||||
|
- new upstream release 9.1.0
|
||||||
|
|
||||||
* Thu Jun 14 2018 Josef Ridky <jridky@redhat.com> - 8.6.10-0.2.20180605git986f99d
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.4-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 18 2021 Josef Ridky <jridky@redhat.com> - 9.0.4-4
|
||||||
|
- remove asciidoc-music sub-package (lilypond requirement)
|
||||||
|
|
||||||
|
* Thu Jan 14 2021 Josef Ridky <jridky@redhat.com> - 9.0.4-3
|
||||||
|
- remove ImageMagic requirement
|
||||||
|
|
||||||
|
* Sun Dec 06 2020 Richard Shaw <hobbes1069@gmail.com> - 9.0.4-2
|
||||||
|
- Add patch to fix problem with not respecting newline configuration.
|
||||||
|
- Remove unused patches.
|
||||||
|
|
||||||
|
* Sat Oct 31 2020 Fabian Affolter <mail@fabian-affolter.ch> - 9.0.4-1
|
||||||
|
- Detection of latest Python releases (#1889725)
|
||||||
|
- Update to latest upstream release 9.0.4
|
||||||
|
|
||||||
|
* Wed Oct 14 2020 Fabian Affolter <mail@fabian-affolter.ch> - 9.0.2-1
|
||||||
|
- Remove patches
|
||||||
|
- Remove Vim support
|
||||||
|
- Update to latest upstream release 9.0.2
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.10-0.16.20180605git986f99d
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.15.20180605git986f99d
|
||||||
|
- Rebuilt for Python 3.9
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.10-0.14.20180605git986f99d
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.13.20180605git986f99d
|
||||||
|
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
||||||
|
|
||||||
|
* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.12.20180605git986f99d
|
||||||
|
- Rebuilt for Python 3.8
|
||||||
|
|
||||||
|
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.10-0.10.20180605git986f99d
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.10-0.9.20180605git986f99d
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Dec 03 2018 Josef Ridky <jridky@redhat.com> - 8.6.10-0.8.20180605git986f99d
|
||||||
|
- Fix deprecation warning (#165537)
|
||||||
|
|
||||||
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.10-0.7.20180605git986f99d
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.6.20180605git986f99d
|
||||||
|
- Rebuilt for Python 3.7
|
||||||
|
|
||||||
|
* Sat Jun 16 2018 Todd Zullinger <tmz@pobox.com> - 8.6.10-0.5.20180605git986f99d
|
||||||
|
- Add some a2x decoding fixes from upstream PR#5
|
||||||
|
(https://github.com/asciidoc/asciidoc-py3/pull/5)
|
||||||
|
|
||||||
|
* Fri Jun 15 2018 Todd Zullinger <tmz@pobox.com> - 8.6.10-0.4.20180605git986f99d
|
||||||
|
- Restore BUGS.txt and CHANGELOG.txt doc files
|
||||||
|
|
||||||
|
* Wed Jun 13 2018 Todd Zullinger <tmz@pobox.com> - 8.6.10-0.3.20180605git986f99d
|
||||||
|
- Use upstream tarball
|
||||||
- Various rpmlint fixes
|
- Various rpmlint fixes
|
||||||
- Remove musicfilter from package (#1571138)
|
|
||||||
|
* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.2.20180605git986f99d
|
||||||
|
- Rebuilt for Python 3.7
|
||||||
|
|
||||||
* Wed Jun 06 2018 Josef Ridky <jridky@redhat.com> - 8.6.10-0.1.20180605git986f99d
|
* Wed Jun 06 2018 Josef Ridky <jridky@redhat.com> - 8.6.10-0.1.20180605git986f99d
|
||||||
|
- Fix versioning, Source and Url label information to align with Fedora Packaging Guidelines
|
||||||
|
|
||||||
|
* Tue Jun 05 2018 Josef Ridky <jridky@redhat.com> - 8.6.8-16.986f99d
|
||||||
- New upstream version with Python3 support - asciidoc-py3 (commit 986f99d)
|
- New upstream version with Python3 support - asciidoc-py3 (commit 986f99d)
|
||||||
- Update versioning, Source and Url label information
|
|
||||||
|
|
||||||
* Wed Feb 14 2018 Josef Ridky <jridky@redhat.com> - 8.6.8-15
|
* Wed Feb 14 2018 Josef Ridky <jridky@redhat.com> - 8.6.8-15
|
||||||
- spec file cleanup (remove Group tag, use autosetup)
|
- spec file cleanup (remove Group tag, use autosetup)
|
@ -1,109 +0,0 @@
|
|||||||
diff --git a/asciidoc-8.6.8-music-noship.patch b/asciidoc-8.6.8-music-noship.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..c0fc89b
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/asciidoc-8.6.8-music-noship.patch
|
|
||||||
@@ -0,0 +1,103 @@
|
|
||||||
+diff -uNr asciidoc-8.6.8-orig/examples/website/build-website.sh asciidoc-8.6.8/examples/website/build-website.sh
|
|
||||||
+--- asciidoc-8.6.8-orig/examples/website/build-website.sh 2013-09-13 10:46:05.486227851 -0400
|
|
||||||
++++ asciidoc-8.6.8/examples/website/build-website.sh 2013-09-13 10:50:35.036112150 -0400
|
|
||||||
+@@ -20,6 +20,5 @@
|
|
||||||
+ $ASCIIDOC_HTML README-website.txt
|
|
||||||
+ $ASCIIDOC_HTML support.txt
|
|
||||||
+ $ASCIIDOC_HTML source-highlight-filter.txt
|
|
||||||
+-$ASCIIDOC_HTML music-filter.txt
|
|
||||||
+ $ASCIIDOC_HTML a2x.1.txt
|
|
||||||
+ $ASCIIDOC_HTML asciimath.txt
|
|
||||||
+diff -uNr asciidoc-8.6.8-orig/tests/data/filters-test.txt asciidoc-8.6.8/tests/data/filters-test.txt
|
|
||||||
+--- asciidoc-8.6.8-orig/tests/data/filters-test.txt 2013-09-13 10:46:05.496229029 -0400
|
|
||||||
++++ asciidoc-8.6.8/tests/data/filters-test.txt 2013-09-13 10:51:12.370110678 -0400
|
|
||||||
+@@ -54,37 +54,3 @@
|
|
||||||
+ ---------------------------------------------------------------------
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+-== Music filter
|
|
||||||
+-
|
|
||||||
+-.A tune generated from ABC notation
|
|
||||||
+-[music,music1.png]
|
|
||||||
+----------------------------------------------------------------------
|
|
||||||
+-T:The Butterfly
|
|
||||||
+-R:slip jig
|
|
||||||
+-C:Tommy Potts
|
|
||||||
+-H:Fiddle player Tommy Potts made this tune from two older slip jigs,
|
|
||||||
+-H:one of which is called "Skin the Peelers" in Roche's collection.
|
|
||||||
+-D:Bothy Band: 1975.
|
|
||||||
+-M:9/8
|
|
||||||
+-K:Em
|
|
||||||
+-vB2(E G2)(E F3)|B2(E G2)(E F)ED|vB2(E G2)(E F3)|(B2d) d2(uB A)FD:|
|
|
||||||
+-|:(vB2c) (e2f) g3|(uB2d) (g2e) (dBA)|(B2c) (e2f) g2(ua|b2a) (g2e) (dBA):|
|
|
||||||
+-|:~B3 (B2A) G2A|~B3 BA(uB d)BA|~B3 (B2A) G2(A|B2d) (g2e) (dBA):|
|
|
||||||
+----------------------------------------------------------------------
|
|
||||||
+-
|
|
||||||
+-<<X1,Link to following fragment>>.
|
|
||||||
+-
|
|
||||||
+-[[X1]]
|
|
||||||
+-.A fragment generated from LilyPond source
|
|
||||||
+-["music", "music2.png", "ly", link="music2.ly"]
|
|
||||||
+----------------------------------------------------------------------
|
|
||||||
+-\version "2.10.0"
|
|
||||||
+-\paper {
|
|
||||||
+- ragged-right = ##t
|
|
||||||
+-}
|
|
||||||
+-{
|
|
||||||
+- \time 3/4
|
|
||||||
+- \clef bass
|
|
||||||
+- c2 e4 g2. f4 e d c2 r4
|
|
||||||
+-}
|
|
||||||
+----------------------------------------------------------------------
|
|
||||||
+diff -uNr asciidoc-8.6.8-orig/tests/data/open-block-test.txt asciidoc-8.6.8/tests/data/open-block-test.txt
|
|
||||||
+--- asciidoc-8.6.8-orig/tests/data/open-block-test.txt 2013-09-13 10:46:05.498229242 -0400
|
|
||||||
++++ asciidoc-8.6.8/tests/data/open-block-test.txt 2013-09-13 10:51:28.746109565 -0400
|
|
||||||
+@@ -103,15 +103,3 @@
|
|
||||||
+ digraph G { rankdir=LR; Graphviz->AsciiDoc->HTML}
|
|
||||||
+ --
|
|
||||||
+
|
|
||||||
+-[music]
|
|
||||||
+---
|
|
||||||
+-\version "2.10.0"
|
|
||||||
+-\paper {
|
|
||||||
+- ragged-right = ##t
|
|
||||||
+-}
|
|
||||||
+-{
|
|
||||||
+- \time 3/4
|
|
||||||
+- \clef bass
|
|
||||||
+- c2 e4 g2. f4 e d c2 r4
|
|
||||||
+-}
|
|
||||||
+---
|
|
||||||
+diff -uNr asciidoc-8.6.8-orig/tests/data/testcases.txt asciidoc-8.6.8/tests/data/testcases.txt
|
|
||||||
+--- asciidoc-8.6.8-orig/tests/data/testcases.txt 2013-09-13 10:46:05.498229242 -0400
|
|
||||||
++++ asciidoc-8.6.8/tests/data/testcases.txt 2013-09-13 10:50:35.037112150 -0400
|
|
||||||
+@@ -310,7 +310,7 @@
|
|
||||||
+
|
|
||||||
+ // Images and icons directories.
|
|
||||||
+ :imagesdir: ../../doc
|
|
||||||
+-image::music2.png[]
|
|
||||||
++// image::music2.png[]
|
|
||||||
+
|
|
||||||
+ :icons:
|
|
||||||
+ :iconsdir: ../../images/icons
|
|
||||||
+diff -uNr asciidoc-8.6.8-orig/doc/slidy-example.txt asciidoc-8.6.8/doc/slidy-example.txt
|
|
||||||
+--- asciidoc-8.6.8-orig/doc/slidy-example.txt 2013-09-13 10:46:05.484227592 -0400
|
|
||||||
++++ asciidoc-8.6.8/doc/slidy-example.txt 2013-09-13 12:30:43.225757230 -0400
|
|
||||||
+@@ -151,17 +151,3 @@
|
|
||||||
+ else:
|
|
||||||
+ return word
|
|
||||||
+ ---------------------------------------------------------------------
|
|
||||||
+-
|
|
||||||
+-[music]
|
|
||||||
+-.Music
|
|
||||||
+----------------------------------------------------------------------
|
|
||||||
+-\version "2.10.0"
|
|
||||||
+-\paper {
|
|
||||||
+- ragged-right = ##t
|
|
||||||
+-}
|
|
||||||
+-{
|
|
||||||
+- \time 3/4
|
|
||||||
+- \clef bass
|
|
||||||
+- c2 e4 g2. f4 e d c2 r4
|
|
||||||
+-}
|
|
||||||
+----------------------------------------------------------------------
|
|
@ -1,26 +0,0 @@
|
|||||||
diff -urNp a/Makefile.in b/Makefile.in
|
|
||||||
--- a/Makefile.in 2018-08-14 14:12:46.853533879 +0200
|
|
||||||
+++ b/Makefile.in 2018-08-14 14:14:03.522336821 +0200
|
|
||||||
@@ -45,11 +45,6 @@ graphvizfilterdir = $(filtersdir)/graphv
|
|
||||||
graphvizfilterconf = filters/graphviz/graphviz-filter.conf
|
|
||||||
graphvizfilterconfdir = $(filtersdir)/graphviz
|
|
||||||
|
|
||||||
-musicfilter = filters/music/music2png.py
|
|
||||||
-musicfilterdir = $(filtersdir)/music
|
|
||||||
-musicfilterconf = filters/music/music-filter.conf
|
|
||||||
-musicfilterconfdir = $(filtersdir)/music
|
|
||||||
-
|
|
||||||
sourcefilterconf = filters/source/source-highlight-filter.conf
|
|
||||||
sourcefilterconfdir = $(filtersdir)/source
|
|
||||||
|
|
||||||
@@ -86,8 +81,8 @@ iconsdir = $(ASCIIDOCCONF)/images/icons
|
|
||||||
|
|
||||||
doc = $(wildcard README*) $(wildcard BUGS*) $(wildcard INSTALL*) $(wildcard CHANGELOG*)
|
|
||||||
|
|
||||||
-DATATARGETS = manp conf docbook dblatex css js callouts icons codefilterconf musicfilterconf sourcefilterconf graphvizfilterconf latexfilterconf flasktheme volnitskytheme
|
|
||||||
-PROGTARGETS = prog codefilter musicfilter graphvizfilter latexfilter
|
|
||||||
+DATATARGETS = manp conf docbook dblatex css js callouts icons codefilterconf sourcefilterconf graphvizfilterconf latexfilterconf flasktheme volnitskytheme
|
|
||||||
+PROGTARGETS = prog codefilter graphvizfilter latexfilter
|
|
||||||
TARGETS = $(DATATARGETS) $(PROGTARGETS) doc
|
|
||||||
|
|
||||||
INSTDIRS = $(TARGETS:%=%dir)
|
|
@ -1,28 +0,0 @@
|
|||||||
from Config import *
|
|
||||||
|
|
||||||
# The libxslt dependency is needed for /usr/bin/xsltproc
|
|
||||||
addFilter('asciidoc.noarch: E: explicit-lib-dependency libxslt')
|
|
||||||
|
|
||||||
# a2x.py and asciidoc.py and symlinked from a2x and asciidoc, respectively.
|
|
||||||
# Both commands have man-pages under their preferred names
|
|
||||||
addFilter('asciidoc.noarch: W: no-manual-page-for-binary a2x.py')
|
|
||||||
addFilter('asciidoc.noarch: W: no-manual-page-for-binary asciidoc.py')
|
|
||||||
|
|
||||||
# The dangling symlinks are all provided in asciidoc, which asciidoc-doc
|
|
||||||
# requires
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/dblatex ../../asciidoc/dblatex')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/docbook-xsl ../../asciidoc/docbook-xsl')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/ASCIIMathML.js ../../javascripts/ASCIIMathML.js')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/CHANGELOG.txt ../../CHANGELOG.txt')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/INSTALL.txt ../../INSTALL.txt')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/LaTeXMathML.js ../../javascripts/LaTeXMathML.js')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/README.txt ../../README.asciidoc')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/asciidoc.css ../../stylesheets/asciidoc.css')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/asciidoc.js ../../javascripts/asciidoc.js')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/xhtml11-quirks.css ../../stylesheets/xhtml11-quirks.css')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/images ../../asciidoc/images')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/javascripts ../../asciidoc/javascripts')
|
|
||||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/stylesheets ../../asciidoc/stylesheets')
|
|
||||||
|
|
||||||
# The latex and music subpackages don't have separate documentation
|
|
||||||
addFilter('asciidoc-(latex|music).noarch: W: no-documentation')
|
|
Loading…
Reference in New Issue
Block a user