pool/texlive-specs-u
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add patch de-macro_p2top3.dif

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive-specs-u?expand=0&rev=89
This commit is contained in:
Dr. Werner Fink 2021-03-09 09:00:23 +00:00 committed by Git OBS Bridge
parent ad3623f829
commit fc11762f8d
4 changed files with 8 additions and 2315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1973
de-macro_p2top3.dif
View File

File diff suppressed because it is too large Load Diff

341
lilyglyphs_p2top3.dif
View File

@ -1,341 +0,0 @@
From d5b5575eea3dd76903248a5cec5f660e49012a7b Mon Sep 17 00:00:00 2001
From: Davide Liessi <davide.liessi@gmail.com>
Date: Mon, 21 Sep 2020 17:35:36 +0200
Subject: [PATCH] run 2to3 on Python scripts
---
texmf-dist/scripts/lilyglyphs/lily-glyph-commands.py | 20 +++----
texmf-dist/scripts/lilyglyphs/lily-image-commands.py | 50 +++++++++----------
texmf-dist/scripts/lilyglyphs/lily-rebuild-pdfs.py | 36 ++++++-------
texmf-dist/scripts/lilyglyphs/lilyglyphs_common.py | 16 +++---
4 files changed, 61 insertions(+), 61 deletions(-)
--- texmf-dist/scripts/lilyglyphs/lily-glyph-commands.py
+++ texmf-dist/scripts/lilyglyphs/lily-glyph-commands.py 2021-02-09 08:46:43.266270061 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
# %
@@ -80,10 +80,10 @@ def read_entries():
if not len(line):
# skip if cmd and glyph haven't been filled both
if not (entry['cmd'] and entry['element']):
- print 'Skip malformed entry \'' + entry['cmd'] + '\'. Please check input file'
+ print('Skip malformed entry \'' + entry['cmd'] + '\'. Please check input file')
reset_entry()
else:
- print 'Read entry \'' + entry['cmd'] + '\''
+ print('Read entry \'' + entry['cmd'] + '\'')
lg.in_cmds[entry['cmd']] = {}
lg.in_cmds[entry['cmd']]['element'] = entry['element']
lg.in_cmds[entry['cmd']]['type'] = entry['type']
@@ -110,13 +110,13 @@ def read_entries():
def usage():
- print 'genGlyphCommands.py'
- print 'is part of the lilyglyphs package'
- print ''
- print 'Usage:'
- print 'Pass the name (without path) of an input definitions file'
- print '(this has to be located in the /stash_new_commands directory.'
- print 'Please refer to the manual (documentation/lilyglyphs.pdf).'
+ print('genGlyphCommands.py')
+ print('is part of the lilyglyphs package')
+ print('')
+ print('Usage:')
+ print('Pass the name (without path) of an input definitions file')
+ print('(this has to be located in the /stash_new_commands directory.')
+ print('Please refer to the manual (documentation/lilyglyphs.pdf).')
# ####################################
# Finally launch the program
--- texmf-dist/scripts/lilyglyphs/lily-image-commands.py
+++ texmf-dist/scripts/lilyglyphs/lily-image-commands.py 2021-02-09 08:46:49.826143530 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
# %
@@ -63,35 +63,35 @@ lily_src_score = """
def main():
"""Do the actual work of the script"""
- print ''
- print 'buildglyphimages.py,'
- print 'Part of lilyglyphs.'
- print ''
+ print('')
+ print('buildglyphimages.py,')
+ print('Part of lilyglyphs.')
+ print('')
# set CWD and ensure the necessary subdirs are present
check_paths()
- print ''
+ print('')
# load and parse input file
lg.read_input_file(in_file)
read_entries()
- print ''
+ print('')
# generate LilyPond source files for each command
# and compile them
write_lily_src_files()
- print ''
+ print('')
lg.compile_lily_files()
- print ''
+ print('')
# remove intermediate files and move pdfs to pdf directory
lg.cleanup_lily_files()
- print ''
+ print('')
# generate latex commands and example code
# and write them to the output file
lg.generate_latex_commands()
- print ''
+ print('')
write_latex_file()
@@ -127,11 +127,11 @@ rais = ''
def read_entries():
"""Parses the input source file and extracts glyph entries"""
- print 'Read entries of LilyPond commands:'
+ print('Read entries of LilyPond commands:')
for i in range(len(lg.definitions_file)):
if '%%lilyglyphs' in lg.definitions_file[i]:
i = read_entry(i)
- print lg.lily_files
+ print(lg.lily_files)
def read_entry(i):
"""Reads a single glyph entry from the input file and stores it
@@ -165,11 +165,11 @@ def read_entry(i):
# read command name
line = lg.definitions_file[i].strip()
cmd_name = line[: line.find('=') - 1]
- print '- ' + cmd_name,
+ print('- ' + cmd_name, end=' ')
if is_protected:
- print '(protected and skipped)'
+ print('(protected and skipped)')
else:
- print '' #(for line break only)
+ print('') #(for line break only)
# read actual command until we find a line the begins with a closing curly bracket
i += 1
@@ -193,7 +193,7 @@ def read_entry(i):
def usage():
- print """buildglyphimages. Part of the lilyglyphs package.
+ print("""buildglyphimages. Part of the lilyglyphs package.
Parses a template file, creates
single .ly files from it, uses LilyPond to create single glyph
pdf files and set up template files to be used in LaTeX.
@@ -204,7 +204,7 @@ def usage():
For detailed instructions refer to the manual.
Usage:
buildglyphimages.py in-file-name.
- """
+ """)
def write_file_info(name, fout):
"""Formats file specific information for the lilyPond source file"""
@@ -225,22 +225,22 @@ def write_file_info(name, fout):
def write_latex_file():
"""Composes LaTeX file and writes it to disk"""
- print 'Generate LaTeX file'
- print lg.dir_cmd, in_basename
+ print('Generate LaTeX file')
+ print(lg.dir_cmd, in_basename)
lg.write_latex_file(os.path.join(os.getcwd(), lg.dir_cmd, in_basename + '.tex'))
def write_lily_src_files():
"""Generates one .ly file for each found new command"""
skip_cmds = []
- print 'Write .ly files for each entry:'
+ print('Write .ly files for each entry:')
for cmd_name in lg.in_cmds:
- print '- ' + cmd_name
+ print('- ' + cmd_name)
gen_src_name = os.path.join(lg.dir_lysrc, cmd_filename(cmd_name) + '.ly')
# handle existing commands
if os.path.exists(gen_src_name):
action = ''
while not (action == 'Y' or action == 'N'):
- action = raw_input('already present. Overwrite (y/n)? ')
+ action = input('already present. Overwrite (y/n)? ')
action = action.upper()
if action == 'N':
skip_cmds.append(cmd_name)
@@ -281,7 +281,7 @@ def write_lily_src_files():
fout.close()
# remove skipped commands from in_cmds
- print skip_cmds
+ print(skip_cmds)
for cmd_name in skip_cmds:
del lg.in_cmds[cmd_name]
lg.lily_files.remove(cmd_filename(cmd_name))
@@ -314,7 +314,7 @@ if __name__ == "__main__":
in_path, in_filename = os.path.split(in_file)
in_path = os.path.normpath(in_path)
if not (('lilyglyphs' in in_path) and (in_path.endswith('definitions'))):
- print 'File in the wrong location: ' + in_path
+ print('File in the wrong location: ' + in_path)
usage()
sys.exit(2)
in_basename, in_ext = os.path.splitext(in_filename)
--- texmf-dist/scripts/lilyglyphs/lily-rebuild-pdfs.py
+++ texmf-dist/scripts/lilyglyphs/lily-rebuild-pdfs.py 2021-02-09 08:46:57.062003966 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
# %
@@ -54,9 +54,9 @@ import os, sys, subprocess, argparse, li
def main():
"""Main walk through the program"""
- print 'rebuild-pdfs.py'
- print 'regenerate all pdf images that are not present (anymore)'
- print ''
+ print('rebuild-pdfs.py')
+ print('regenerate all pdf images that are not present (anymore)')
+ print('')
# Check if we are in a legal CWD and ensure a PDF subdir is present
check_paths()
@@ -66,14 +66,14 @@ def main():
# is there anything to be done at all?
if len(src_files) == 0:
- print ''
- print 'No image files missing, nothing to be done.'
- print 'If you want to re-create pdfs, then delete them first'
+ print('')
+ print('No image files missing, nothing to be done.')
+ print('If you want to re-create pdfs, then delete them first')
sys.exit(0)
- print ''
- print 'Found ' + str(len(src_files)) + ' missing file(s).'
+ print('')
+ print('Found ' + str(len(src_files)) + ' missing file(s).')
for cmd in src_files:
- print '- ' + cmd
+ print('- ' + cmd)
# compile all LilyPond files without matching pdf
lg.lily_files = src_files
@@ -86,7 +86,7 @@ def check_missing_pdfs():
"""Compares the list of LilyPond source and resulting PDF files.
Returns a list of LilyPond source file basenames
which don't have a corresponding PDF file"""
- print 'Reading file lists, counting missing pdf files'
+ print('Reading file lists, counting missing pdf files')
# read existing .pdf files in lg.dir_pdfs
img_files = []
@@ -114,21 +114,21 @@ def check_paths():
"""Checks if we're in the right CWD
and makes sure that there is a pdf output directory available"""
- print 'Checking directories ...'
+ print('Checking directories ...')
# check the presence of the necessary subdirectories
ls = os.listdir('.')
if not 'generated_src' in ls:
- print 'No LilyPond source files directory found.'
- print 'Sorry, there is something wrong :-('
- print 'Current working directory is: ' + os.getcwd()
- print 'Please consult the manual.'
+ print('No LilyPond source files directory found.')
+ print('Sorry, there is something wrong :-(')
+ print('Current working directory is: ' + os.getcwd())
+ print('Please consult the manual.')
sys.exit(2)
if not 'pdfs' in ls:
os.mkdir('pdfs')
- print '... done'
- print ''
+ print('... done')
+ print('')
# ####################################
--- texmf-dist/scripts/lilyglyphs/lilyglyphs_common.py
+++ texmf-dist/scripts/lilyglyphs/lilyglyphs_common.py 2021-02-09 08:47:04.397862469 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
# %
@@ -232,7 +232,7 @@ def cleanup_lily_files():
"""Removes unneccessary files from LilyPond compilation,
rename and remove the preview PDF files to the right directory."""
- print 'Clean up directories'
+ print('Clean up directories')
# iterate through dir_lysrc
os.chdir(dir_lysrc)
@@ -255,7 +255,7 @@ def cleanup_lily_files():
def compile_lily_files():
"""Compiles LilyPond files to """
- print 'Compile with LilyPond:'
+ print('Compile with LilyPond:')
for file in lily_files:
args = []
args.append("lilypond")
@@ -265,7 +265,7 @@ def compile_lily_files():
args.append("-dno-point-and-click")
args.append(os.path.join(dir_lysrc, file + ".ly"))
subprocess.call(args)
- print ''
+ print('')
def generate_latex_commands():
"""Generates the templates for the commands in a new LaTeX file.
@@ -308,12 +308,12 @@ def read_input_file(in_file):
in_file = os.path.normpath(in_file)
- print 'Read input file ' + in_file
+ print('Read input file ' + in_file)
# check for existence of input file
if not os.path.exists(in_file):
- print 'File ' + in_file + ' not found.'
- print 'Please specify an input file'
+ print('File ' + in_file + ' not found.')
+ print('Please specify an input file')
sys.exit(2)
fin = open(in_file, 'r')
@@ -336,7 +336,7 @@ def write_latex_file(file_name):
fout.write(latexfile_start_comment.replace('SCRIPT_NAME', script_name()))
# write out command definitions
- sorted_cmds = sorted(latex_cmds.iterkeys())
+ sorted_cmds = sorted(latex_cmds.keys())
for cmd_name in sorted_cmds:
for line in latex_cmds[cmd_name]['cmd']:
fout.write(line)

7
texlive-specs-u.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 5 13:52:04 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Rename patch lilyglyphs-8ffa820e4.dif to lilyglyphs_p2top3.dif
- Add patch de-macro_p2top3.dif
* Re-enable texlive-de-macro as required by extra binary package
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 9 08:49:12 UTC 2021 - Dr. Werner Fink <werner@suse.de> Tue Feb 9 08:49:12 UTC 2021 - Dr. Werner Fink <werner@suse.de>

2
texlive-specs-u.spec
View File

@ -21,7 +21,7 @@
%define texlive_version 2020 %define texlive_version 2020
%define texlive_previous 2019 %define texlive_previous 2019
%define texlive_release 20200327 %define texlive_release 20200327
%define texlive_noarch 180 %define texlive_noarch 182
#!BuildIgnore: texlive #!BuildIgnore: texlive
#!BuildIgnore: texlive-scripts #!BuildIgnore: texlive-scripts