From: Jean-Charles Malahieude Date: Sat, 6 May 2017 16:27:36 +0000 (+0200) Subject: Merge branch 'master' into translation X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=02778fdd9839c8e3579eb383dc537f74bf416d22;hp=610bf69ea525b0f42f070ebb7f83896b15b00779;p=lilypond.git Merge branch 'master' into translation --- diff --git a/Documentation/ly-examples/granados.ly b/Documentation/ly-examples/granados.ly index 9f4cf10301..5cabf5766e 100644 --- a/Documentation/ly-examples/granados.ly +++ b/Documentation/ly-examples/granados.ly @@ -9,7 +9,7 @@ \paper { ragged-right = ##f - #(set-paper-size "letter" 'landscape) + #(set-paper-size "letterlandscape") system-count = 1 } diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile index ef72775059..8ae3e463bb 100644 --- a/Documentation/pictures/GNUmakefile +++ b/Documentation/pictures/GNUmakefile @@ -38,7 +38,7 @@ $(outdir)/%.jpg: %.jpg ln -f $< $@ $(outdir)/%.png: %.eps - gs -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit + gs -dAutoRotatePages=/None -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit $(outdir)/%.pdf: %.eps gs -dAutoRotatePages=/None -q -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $< diff --git a/lily/duration.cc b/lily/duration.cc index 0c6fa4dd5f..880b22c46a 100644 --- a/lily/duration.cc +++ b/lily/duration.cc @@ -152,8 +152,8 @@ Duration::print_smob (SCM port, scm_print_state *) const SCM Duration::equal_p (SCM a, SCM b) { - Duration *p = (Duration *) SCM_CELL_WORD_1 (a); - Duration *q = (Duration *) SCM_CELL_WORD_1 (b); + Duration *p = unsmob (a); + Duration *q = unsmob (b); bool eq = p->dots_ == q->dots_ && p->durlog_ == q->durlog_ diff --git a/lily/pdf-scheme.cc b/lily/pdf-scheme.cc index da2ce2cef3..61cf382e6b 100644 --- a/lily/pdf-scheme.cc +++ b/lily/pdf-scheme.cc @@ -84,14 +84,16 @@ LY_DEFINE (ly_encode_string_for_pdf, "ly:encode-string-for-pdf", free (p); /* Convert back to SCM object and return it */ - /* FIXME guile-2.0: With guile 2.0 the internal representation of a string - * has changed (char vector rather than binary bytes in - * UTF-8). However, with guile 2.0, ly:encode-string-for-pdf - * is no longer needed and can be replaced by the new - * (string->utf16 str 'big) - */ if (g) - return scm_take_str (g, bytes_written); // scm_take_str eventually frees g! + { + /* + * Return the raw byte representation of the UTF-16BE encoded string, + * in a locale independent way. + */ + SCM string = scm_from_latin1_stringn (g, bytes_written); + free(g); + return string; + } else return str; } diff --git a/lily/pitch.cc b/lily/pitch.cc index 9e46bba70e..ee03ac44d8 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -238,8 +238,8 @@ Pitch::print_smob (SCM port, scm_print_state *) const SCM Pitch::equal_p (SCM a, SCM b) { - Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a); - Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b); + Pitch *p = unsmob (a); + Pitch *q = unsmob (b); bool eq = p->notename_ == q->notename_ && p->octave_ == q->octave_ diff --git a/ly/arabic.ly b/ly/arabic.ly index ec637d316f..b8e3cae124 100644 --- a/ly/arabic.ly +++ b/ly/arabic.ly @@ -1,37 +1,46 @@ -\version "2.17.6" -\language "italiano" +%%%% Definitions for writing modern Arabic music scores +%%%% This file is part of LilyPond, the GNU music typesetter. +%%%% +%%%% Copyright (C) 2017 Amir Czwink +%%%% Copyright (C) 2008 Neil Puttock +%%%% +%%%% LilyPond is free software: you can redistribute it and/or modify +%%%% it under the terms of the GNU General Public License as published by +%%%% the Free Software Foundation, either version 3 of the License, or +%%%% (at your option) any later version. +%%%% +%%%% LilyPond is distributed in the hope that it will be useful, +%%%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%%%% GNU General Public License for more details. +%%%% +%%%% You should have received a copy of the GNU General Public License +%%%% along with LilyPond. If not, see . +\version "2.18.2" +\language "italiano" %Arabs usually use italian note names -%%%%%%% -% -% Definition of "dwn" symbol in order to draw the half flat symbol -% that is more often used in Arabic music (A b with a slash across), -% rather than the reverse b symbol that is used by LilyPond. -% The method was contributed by Valentin Villenave on the LilyPond Forum -% -% http://www.mail-archive.com/lilypond-user@gnu.org/msg34244.html -% -% Exchange on 17 January 2008 -% -% Updated based on email advice 10 July 2008, by Neil Puttock -% -% -% Example -% -% dod dob dosd \dwn dob dobsb dodsd do -% +% Modern Arabic scores are written using a 24-TET tonal system. +% The accidental that lowers by a quarter is however the slashed flat, not the +% mirrored one lilypond uses by default. +TwentyFourTETglyphs = #'( + (0 . "accidentals.natural") + (-1/2 . "accidentals.flat") + (1/2 . "accidentals.sharp") -dwn = { - \once \override Voice.Accidental.stencil = #(lambda (grob) - (ly:stencil-combine-at-edge - (ly:accidental-interface::print grob) Y UP - (grob-interpret-markup grob (markup #:line - (#:fontsize -1 (#:musicglyph "flags.ugrace")))) -1.3)) -} + (3/4 . "accidentals.sharp.slashslash.stemstemstem") + (1/4 . "accidentals.sharp.slashslash.stem") + (-1/4 . "accidentals.flat.slash") + (-3/4 . "accidentals.mirroredflat.flat") + + (1 . "accidentals.doublesharp") + (-1 . "accidentals.flatflat") +) % -% Arabic maqam groups +% Arabic maqamat ordered by maqam family % +% Bayati family bayati = #`( (0 . ,NATURAL) (1 . ,SEMI-FLAT) @@ -42,6 +51,28 @@ bayati = #`( (6 . ,FLAT) ) +% Hijaz family +hijaz = #`( + (0 . ,NATURAL) + (1 . ,FLAT) + (2 . ,NATURAL) + (3 . ,NATURAL) + (4 . ,NATURAL) + (5 . ,FLAT) + (6 . ,FLAT) +) + +hijaz_kar = #`( + (0 . ,NATURAL) + (1 . ,FLAT) + (2 . ,NATURAL) + (3 . ,NATURAL) + (4 . ,NATURAL) + (5 . ,FLAT) + (6 . ,NATURAL) +) + +% Kurd/Kurdi family kurd = #`( (0 . ,NATURAL) (1 . ,FLAT) @@ -50,8 +81,9 @@ kurd = #`( (4 . ,NATURAL) (5 . ,FLAT) (6 . ,FLAT) - ) +) +% Rast family rast = #`( (0 . ,NATURAL) (1 . ,NATURAL) @@ -62,6 +94,7 @@ rast = #`( (6 . ,SEMI-FLAT) ) +% Sikah family sikah = #`( (0 . ,NATURAL) (1 . ,SEMI-FLAT) @@ -82,23 +115,73 @@ iraq = #`( (6 . ,SEMI-FLAT) ) + + + +% Layout settings \layout { \context { \Score - keyAlterationOrder = + + \override Accidental.glyph-name-alist = \TwentyFourTETglyphs + \override KeySignature.glyph-name-alist = \TwentyFourTETglyphs + + keyAlterationOrder = #`( - (6 . ,FLAT) (2 . ,FLAT) (5 . ,FLAT ) (1 . ,FLAT) - (4 . ,FLAT) (0 . ,FLAT) (3 . ,FLAT) - (6 . ,SEMI-FLAT) (2 . ,SEMI-FLAT) (5 . ,SEMI-FLAT ) (1 . ,SEMI-FLAT) - (4 . ,SEMI-FLAT) (0 . ,SEMI-FLAT) (3 . ,SEMI-FLAT) - (3 . ,SHARP) (0 . ,SHARP) (4 . ,SHARP) (1 . ,SHARP) - (5 . ,SHARP) (2 . ,SHARP) (6 . ,SHARP) - (3 . ,SEMI-SHARP) (0 . ,SEMI-SHARP) (4 . ,SEMI-SHARP) (1 . ,SEMI-SHARP) - (5 . ,SEMI-SHARP) (2 . ,SEMI-SHARP) (6 . ,SEMI-SHARP) - (6 . ,DOUBLE-FLAT) (2 . ,DOUBLE-FLAT) (5 . ,DOUBLE-FLAT ) (1 . ,DOUBLE-FLAT) - (4 . ,DOUBLE-FLAT) (0 . ,DOUBLE-FLAT) (3 . ,DOUBLE-FLAT) - (3 . ,DOUBLE-SHARP) (0 . ,DOUBLE-SHARP) (4 . ,DOUBLE-SHARP) (1 . ,DOUBLE-SHARP) - (5 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (6 . ,DOUBLE-SHARP) + (6 . ,FLAT) (2 . ,FLAT) (5 . ,FLAT ) (1 . ,FLAT) + (4 . ,FLAT) (0 . ,FLAT) (3 . ,FLAT) + (6 . ,SEMI-FLAT) (2 . ,SEMI-FLAT) (5 . ,SEMI-FLAT ) (1 . ,SEMI-FLAT) + (4 . ,SEMI-FLAT) (0 . ,SEMI-FLAT) (3 . ,SEMI-FLAT) + (3 . ,SHARP) (0 . ,SHARP) (4 . ,SHARP) (1 . ,SHARP) + (5 . ,SHARP) (2 . ,SHARP) (6 . ,SHARP) + (3 . ,SEMI-SHARP) (0 . ,SEMI-SHARP) (4 . ,SEMI-SHARP) + (1 . ,SEMI-SHARP) + (5 . ,SEMI-SHARP) (2 . ,SEMI-SHARP) (6 . ,SEMI-SHARP) + (6 . ,DOUBLE-FLAT) (2 . ,DOUBLE-FLAT) (5 . ,DOUBLE-FLAT ) + (1 . ,DOUBLE-FLAT) + (4 . ,DOUBLE-FLAT) (0 . ,DOUBLE-FLAT) (3 . ,DOUBLE-FLAT) + (3 . ,DOUBLE-SHARP) (0 . ,DOUBLE-SHARP) (4 . ,DOUBLE-SHARP) + (1 . ,DOUBLE-SHARP) + (5 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (6 . ,DOUBLE-SHARP) ) - } + } +} + + + + + + + +%%%%%%% +% Amir Czwink: I left this for backward compatibility but it is +% basically useless... +% The \dwn command is totally impractical and cumbersome, as one has to write +% the \dwn command in front of any quarter tone, and also it does not work +% for key signatures. +% +% +% Definition of "dwn" symbol in order to draw the half flat symbol +% that is more often used in Arabic music (A b with a slash across), +% rather than the reverse b symbol that is used by LilyPond. +% The method was contributed by Valentin Villenave on the LilyPond Forum +% +% http://www.mail-archive.com/lilypond-user@gnu.org/msg34244.html +% +% Exchange on 17 January 2008 +% +% Updated based on email advice 10 July 2008, by Neil Puttock +% +% +% Example +% +% dod dob dosd \dwn dob dobsb dodsd do +% + +dwn = { + \once \override Voice.Accidental.stencil = #(lambda (grob) + (ly:stencil-combine-at-edge + (ly:accidental-interface::print grob) Y UP + (grob-interpret-markup grob (markup #:line + (#:fontsize -1 (#:musicglyph "flags.ugrace")))) -1.3)) } diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make index e0c0756bc4..243a9f18c7 100644 --- a/make/lilypond-book-rules.make +++ b/make/lilypond-book-rules.make @@ -29,7 +29,7 @@ $(outdir)/%.pdf: $(outdir)/%.tex cd $(outdir) && $(buildscript-dir)/run-and-check "$(PDFLATEX) -halt-on-error $(notdir $<)" "$*.pdflatex.log" ifeq ($(USE_EXTRACTPDFMARK),yes) $(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $@ - $(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@ + $(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -dAutoRotatePages=/None -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@ rm $@ mv $(outdir)/$*.final.pdf $@ endif @@ -61,7 +61,7 @@ $(outdir)/%.pdf: $(outdir)/%.xml cd $(outdir) && $(buildscript-dir)/run-and-check "$(DBLATEX) $(DBLATEX_BACKEND) $(notdir $<)" "$*.dblatex.log" ifeq ($(USE_EXTRACTPDFMARK),yes) $(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $@ - $(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@ + $(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -dAutoRotatePages=/None -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@ rm $@ mv $(outdir)/$*.final.pdf $@ endif diff --git a/scm/backend-library.scm b/scm/backend-library.scm index 240096cad2..8eec320288 100644 --- a/scm/backend-library.scm +++ b/scm/backend-library.scm @@ -98,6 +98,7 @@ "-r1200" (if (ly:bigpdfs) "-dSubsetFonts=false") "-sDEVICE=pdfwrite" + "-dAutoRotatePages=/None" (string-append "-sOutputFile=" (string-join (string-split pdf-name #\%) diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index 9498b2ac9d..2cd9b5edc6 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -599,8 +599,14 @@ (define (metadata-encode val) ;; First, call ly:encode-string-for-pdf to encode the string (latin1 or ;; utf-16be), then escape all parentheses and backslashes - ;; FIXME guile-2.0: use (string->utf16 str 'big) instead - + ;; + ;; NOTE: with guile-2.0+ ly:encode-string-for-pdf is not really needed and + ;; could be replaced with the following code: + ;; + ;; (let* ((utf16be-bom #vu8(#xFE #xFF))) + ;; (string-append (bytevector->string utf16be-bom "ISO-8859-1") + ;; (bytevector->string (string->utf16 val 'big) "ISO-8859-1"))) + ;; (ps-quote (ly:encode-string-for-pdf val))) (define (metadata-lookup-output overridevar fallbackvar field) (let* ((overrideval (ly:modules-lookup (list header) overridevar)) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 56e348da3d..282cb233a7 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -1165,21 +1165,51 @@ between the two text elements." '(bound-details left padding) (+ my-padding script-padding))))))) +(define-public (make-connected-line points grob) + "Takes a list of points, @var{points}. +Returns a line connecting @var{points}, using @code{ly:line-interface::line}, +gets layout information from @var{grob}" + (define (connected-points grob ls pts) + (if (not (pair? (cdr pts))) + (reduce ly:stencil-add empty-stencil ls) + (connected-points + grob + (cons + (ly:line-interface::line + grob + (car (first pts)) + (cdr (first pts)) + (car (second pts)) + (cdr (second pts))) + ls) + (cdr pts)))) + (if (< (length points) 2) + (begin + (ly:warning + "´make-connected-line´ needs at least two points: ~a" + points) + empty-stencil) + (connected-points grob '() points))) + (define ((elbowed-hairpin coords mirrored?) grob) "Create hairpin based on a list of @var{coords} in @code{(cons x y)} form. @code{x} is the portion of the width consumed for a given line and @code{y} is the portion of the height. For example, -@code{'((0.3 . 0.7) (0.8 . 0.9) (1.0 . 1.0))} means that at the point +@code{'((0 . 0) (0.3 . 0.7) (0.8 . 0.9) (1.0 . 1.0))} means that at the point where the hairpin has consumed 30% of its width, it must be at 70% of its height. Once it is to 80% width, it -must be at 90% height. It finishes at -100% width and 100% height. @var{mirrored?} indicates if the hairpin -is mirrored over the Y-axis or if just the upper part is drawn. +must be at 90% height. It finishes at 100% width and 100% height. +If @var{coords} does not begin with @code{'(0 . 0)} the final hairpin may have +an open tip. For example '(0 . 0.5) will cause an open end of 50% of the usual +height. +@var{mirrored?} indicates if the hairpin is mirrored over the Y-axis or if +just the upper part is drawn. Returns a function that accepts a hairpin grob as an argument and draws the stencil based on its coordinates. + @lilypond[verbatim,quote] #(define simple-hairpin - (elbowed-hairpin '((1.0 . 1.0)) #t)) + (elbowed-hairpin '((0 . 0)(1.0 . 1.0)) #t)) \\relative c' { \\override Hairpin #'stencil = #simple-hairpin @@ -1187,50 +1217,52 @@ and draws the stencil based on its coordinates. } @end lilypond " - (define (pair-to-list pair) - (list (car pair) (cdr pair))) - (define (normalize-coords goods x y) + (define (scale-coords coords-list x y) (map - (lambda (coord) - (cons (* x (car coord)) (* y (cdr coord)))) - goods)) - (define (my-c-p-s points thick decresc?) - (make-connected-path-stencil - points - thick - (if decresc? -1.0 1.0) - 1.0 - #f - #f)) + (lambda (coord) (cons (* x (car coord)) (* y (cdr coord)))) + coords-list)) + + (define (hairpin::print-part points decresc? me) + (let ((stil (make-connected-line points me))) + (if decresc? (ly:stencil-scale stil -1 1) stil))) + ;; outer let to trigger suicide (let ((sten (ly:hairpin::print grob))) (if (grob::is-live? grob) (let* ((decresc? (eqv? (ly:grob-property grob 'grow-direction) LEFT)) - (thick (ly:grob-property grob 'thickness 0.1)) - (thick (* thick (layout-line-thickness grob))) (xex (ly:stencil-extent sten X)) (lenx (interval-length xex)) (yex (ly:stencil-extent sten Y)) (leny (interval-length yex)) (xtrans (+ (car xex) (if decresc? lenx 0))) (ytrans (car yex)) - (uplist (map pair-to-list - (normalize-coords coords lenx (/ leny 2)))) - (downlist (map pair-to-list - (normalize-coords coords lenx (/ leny -2))))) - (ly:stencil-translate - (ly:stencil-add - (my-c-p-s uplist thick decresc?) - (if mirrored? (my-c-p-s downlist thick decresc?) empty-stencil)) - (cons xtrans ytrans))) + (uplist (scale-coords coords lenx (/ leny 2))) + (downlist (scale-coords coords lenx (/ leny -2))) + (stil + (ly:stencil-aligned-to + (ly:stencil-translate + (ly:stencil-add + (hairpin::print-part uplist decresc? grob) + (if mirrored? + (hairpin::print-part downlist decresc? grob) + empty-stencil)) + (cons xtrans ytrans)) + Y CENTER)) + (stil-y-extent (ly:stencil-extent stil Y))) + ;; Return a final stencil properly aligned in Y-axis direction and with + ;; proper extents. Otherwise stencil-operations like 'box-stencil' will + ;; return badly. Extent in X-axis direction is taken from the original, + ;; in Y-axis direction from the new stencil. + (ly:make-stencil (ly:stencil-expr stil) xex stil-y-extent)) + ;; return empty, if no Hairpin.stencil present. '()))) (export elbowed-hairpin) (define-public flared-hairpin - (elbowed-hairpin '((0.95 . 0.4) (1.0 . 1.0)) #t)) + (elbowed-hairpin '((0 . 0) (0.95 . 0.4) (1.0 . 1.0)) #t)) (define-public constante-hairpin - (elbowed-hairpin '((1.0 . 0.0) (1.0 . 1.0)) #f)) + (elbowed-hairpin '((0 . 0) (1.0 . 0.0) (1.0 . 1.0)) #f)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; lyrics diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm index f20ca61b41..d0f810fafb 100644 --- a/scm/ps-to-png.scm +++ b/scm/ps-to-png.scm @@ -145,6 +145,7 @@ "-dNOPAUSE" "-dBATCH" (ly:format "-sDEVICE=~a" pixmap-format) + "-dAutoRotatePages=/None" (string-append "-sOutputFile=" output-file) (ly:format "-r~a" (* anti-alias-factor resolution)) (string-append "-f" tmp-name)))) diff --git a/scripts/auxiliar/make-regtest-pngs.sh b/scripts/auxiliar/make-regtest-pngs.sh index 01610e8ac3..d5ee847bc6 100755 --- a/scripts/auxiliar/make-regtest-pngs.sh +++ b/scripts/auxiliar/make-regtest-pngs.sh @@ -70,6 +70,7 @@ while getopts "j:oncr:gpd:" opts; do { $1 gs -sDEVICE=${gsdevice:-pngmono} -q -dNOPAUSE \ -r${resolution:-300} -dNOPLATFONTS \ + -dAutoRotatePages=/None \ -dTextAlphaBits=1 -dGraphicsAlphaBits=1 \ -sOutputFile="${2%.pdf}-%d.png" "$2" -c quit };; diff --git a/scripts/build/output-distance.py b/scripts/build/output-distance.py index 49a659b73f..625ce12a1e 100755 --- a/scripts/build/output-distance.py +++ b/scripts/build/output-distance.py @@ -642,6 +642,7 @@ class SignatureFileLink (FileLink): cmd = ('gs -sDEVICE=png16m -dGraphicsAlphaBits=4 -dTextAlphaBits=4 ' ' %(data_option)s ' ' -r101 ' + ' -dAutoRotatePages=/None ' ' -sOutputFile=%(outfile)s -dNOSAFER -dEPSCrop -q -dNOPAUSE ' ' %(infile)s -c quit ') % locals () diff --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make index 6751e5da9a..5b6e6c04d0 100644 --- a/stepmake/stepmake/tex-rules.make +++ b/stepmake/stepmake/tex-rules.make @@ -23,6 +23,7 @@ $(outdir)/%.pdf: $(outdir)/%.dvi -dNOPAUSE\ -dBATCH\ -sDEVICE=pdfwrite\ + -dAutoRotatePages=/None\ -sOutputFile=$(@F)\ -dCompatibilityLevel=1.2\ -sPAPERSIZE=a4\ diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 007f88fdad..df04e1ebe3 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -74,7 +74,7 @@ else endif ifeq ($(USE_EXTRACTPDFMARK),yes) $(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $@ - $(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@ + $(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -dAutoRotatePages=/None -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@ rm $@ mv $(outdir)/$*.final.pdf $@ endif