change PageFormat to simple style values
This commit is contained in:
Werner Schweer
parent
22743535f7
commit
9a9dedf774
|
|
@ -66,7 +66,7 @@ add_library (
|
|||
synthesizerstate.cpp mcursor.cpp groups.cpp mscoreview.cpp
|
||||
noteline.cpp spannermap.cpp
|
||||
bagpembell.cpp ambitus.cpp keylist.cpp scoreElement.cpp
|
||||
shape.cpp systemdivider.cpp midimapping.cpp stafflines.cpp pageformat.cpp
|
||||
shape.cpp systemdivider.cpp midimapping.cpp stafflines.cpp
|
||||
# read114.cpp
|
||||
read206.cpp
|
||||
read300.cpp stafftypelist.cpp stafftypechange.cpp
|
||||
|
|
|
|||
|
|
@ -1406,7 +1406,7 @@ static void checkDivider(bool left, System* s, qreal sdd)
|
|||
}
|
||||
else {
|
||||
divider->rypos() += s->score()->styleD(StyleIdx::dividerRightY) * SPATIUM20;
|
||||
divider->rxpos() = s->score()->pageFormat()->printableWidth() * DPI - divider->width();
|
||||
divider->rxpos() = s->score()->styleD(StyleIdx::pagePrintableWidth) * DPI - divider->width();
|
||||
divider->rxpos() += s->score()->styleD(StyleIdx::dividerRightX) * SPATIUM20;
|
||||
}
|
||||
divider->adjustReadPos();
|
||||
|
|
@ -2722,7 +2722,7 @@ System* Score::collectSystem(LayoutContext& lc)
|
|||
qreal minWidth = 0;
|
||||
bool firstMeasure = true;
|
||||
bool createHeader = false;
|
||||
qreal systemWidth = pageFormat()->printableWidth() * DPI;
|
||||
qreal systemWidth = styleD(StyleIdx::pagePrintableWidth) * DPI;
|
||||
system->setWidth(systemWidth);
|
||||
|
||||
while (lc.curMeasure) { // collect measure for system
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@
|
|||
#include "excerpt.h"
|
||||
#include "spatium.h"
|
||||
#include "barline.h"
|
||||
#include "pageformat.h"
|
||||
|
||||
namespace Ms {
|
||||
|
||||
|
|
@ -307,6 +306,7 @@ void MScore::init()
|
|||
_defaultStyleForParts.load(&f);
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// load internal fonts
|
||||
//
|
||||
|
|
|
|||
|
|
@ -564,8 +564,8 @@ QList<Element*> Page::elements()
|
|||
|
||||
qreal Page::tm() const
|
||||
{
|
||||
const PageFormat* pf = score()->pageFormat();
|
||||
return ((!pf->twosided() || isOdd()) ? pf->oddTopMargin() : pf->evenTopMargin()) * DPI;
|
||||
return ((!score()->styleB(StyleIdx::pageTwosided) || isOdd())
|
||||
? score()->styleD(StyleIdx::pageOddTopMargin) : score()->styleD(StyleIdx::pageEvenTopMargin)) * DPI;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -574,8 +574,8 @@ qreal Page::tm() const
|
|||
|
||||
qreal Page::bm() const
|
||||
{
|
||||
const PageFormat* pf = score()->pageFormat();
|
||||
return ((!pf->twosided() || isOdd()) ? pf->oddBottomMargin() : pf->evenBottomMargin()) * DPI;
|
||||
return ((!score()->styleB(StyleIdx::pageTwosided) || isOdd())
|
||||
? score()->styleD(StyleIdx::pageOddBottomMargin) : score()->styleD(StyleIdx::pageEvenBottomMargin)) * DPI;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -584,8 +584,8 @@ qreal Page::bm() const
|
|||
|
||||
qreal Page::lm() const
|
||||
{
|
||||
const PageFormat* pf = score()->pageFormat();
|
||||
return ((!pf->twosided() || isOdd()) ? pf->oddLeftMargin() : pf->evenLeftMargin()) * DPI;
|
||||
return ((!score()->styleB(StyleIdx::pageTwosided) || isOdd())
|
||||
? score()->styleD(StyleIdx::pageOddLeftMargin) : score()->styleD(StyleIdx::pageEvenLeftMargin)) * DPI;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -594,8 +594,7 @@ qreal Page::lm() const
|
|||
|
||||
qreal Page::rm() const
|
||||
{
|
||||
const PageFormat* pf = score()->pageFormat();
|
||||
return ((!pf->twosided() || isOdd()) ? pf->oddRightMargin() : pf->evenRightMargin()) * DPI;
|
||||
return score()->styleD(StyleIdx::pagePrintableWidth) * DPI - lm();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1,139 +0,0 @@
|
|||
//=============================================================================
|
||||
// MuseScore
|
||||
// Music Composition & Notation
|
||||
//
|
||||
// Copyright (C) 2002-2011 Werner Schweer
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License version 2
|
||||
// as published by the Free Software Foundation and appearing in
|
||||
// the file LICENCE.GPL
|
||||
//=============================================================================
|
||||
|
||||
#include "pageformat.h"
|
||||
#include "xml.h"
|
||||
|
||||
namespace Ms {
|
||||
|
||||
//---------------------------------------------------------
|
||||
// PageFormat
|
||||
//---------------------------------------------------------
|
||||
|
||||
PageFormat::PageFormat()
|
||||
{
|
||||
_size = QSizeF(210.0/INCH, 297.0/INCH); // A4
|
||||
_evenLeftMargin = 10.0 / INCH;
|
||||
_oddLeftMargin = 10.0 / INCH;
|
||||
_printableWidth = _size.width() - 20.0 / INCH;
|
||||
_evenTopMargin = 10.0 / INCH;
|
||||
_evenBottomMargin = 20.0 / INCH;
|
||||
_oddTopMargin = 10.0 / INCH;
|
||||
_oddBottomMargin = 20.0 / INCH;
|
||||
_twosided = true;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// read
|
||||
// <page-layout>
|
||||
// <page-height>
|
||||
// <page-width>
|
||||
// <landscape>1</landscape>
|
||||
// <page-margins type="both">
|
||||
// <left-margin>28.3465</left-margin>
|
||||
// <right-margin>28.3465</right-margin>
|
||||
// <top-margin>28.3465</top-margin>
|
||||
// <bottom-margin>56.6929</bottom-margin>
|
||||
// </page-margins>
|
||||
// </page-layout>
|
||||
//---------------------------------------------------------
|
||||
|
||||
void PageFormat::read(XmlReader& e)
|
||||
{
|
||||
qreal _oddRightMargin = 0.0;
|
||||
qreal _evenRightMargin = 0.0;
|
||||
QString type;
|
||||
|
||||
while (e.readNextStartElement()) {
|
||||
const QStringRef& tag(e.name());
|
||||
if (tag == "page-margins") {
|
||||
type = e.attribute("type","both");
|
||||
qreal lm = 0.0, rm = 0.0, tm = 0.0, bm = 0.0;
|
||||
while (e.readNextStartElement()) {
|
||||
const QStringRef& tag(e.name());
|
||||
qreal val = e.readDouble() * 0.5 / PPI;
|
||||
if (tag == "left-margin")
|
||||
lm = val;
|
||||
else if (tag == "right-margin")
|
||||
rm = val;
|
||||
else if (tag == "top-margin")
|
||||
tm = val;
|
||||
else if (tag == "bottom-margin")
|
||||
bm = val;
|
||||
else
|
||||
e.unknown();
|
||||
}
|
||||
_twosided = type == "odd" || type == "even";
|
||||
if (type == "odd" || type == "both") {
|
||||
_oddLeftMargin = lm;
|
||||
_oddRightMargin = rm;
|
||||
_oddTopMargin = tm;
|
||||
_oddBottomMargin = bm;
|
||||
}
|
||||
if (type == "even" || type == "both") {
|
||||
_evenLeftMargin = lm;
|
||||
_evenRightMargin = rm;
|
||||
_evenTopMargin = tm;
|
||||
_evenBottomMargin = bm;
|
||||
}
|
||||
}
|
||||
else if (tag == "page-height")
|
||||
_size.rheight() = e.readDouble() * 0.5 / PPI;
|
||||
else if (tag == "page-width")
|
||||
_size.rwidth() = e.readDouble() * .5 / PPI;
|
||||
else
|
||||
e.unknown();
|
||||
}
|
||||
qreal w1 = _size.width() - _oddLeftMargin - _oddRightMargin;
|
||||
qreal w2 = _size.width() - _evenLeftMargin - _evenRightMargin;
|
||||
_printableWidth = qMin(w1, w2); // silently adjust right margins
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// write
|
||||
//---------------------------------------------------------
|
||||
|
||||
void PageFormat::write(XmlWriter& xml) const
|
||||
{
|
||||
xml.stag("page-layout");
|
||||
|
||||
// convert inch to 1/10 spatium units
|
||||
// 20 - font design size in point
|
||||
// SPATIUM = 20/4
|
||||
// qreal t = 10 * PPI / (20 / 4);
|
||||
qreal t = 2 * PPI;
|
||||
|
||||
xml.tag("page-height", _size.height() * t);
|
||||
xml.tag("page-width", _size.width() * t);
|
||||
|
||||
const char* type = "both";
|
||||
if (_twosided) {
|
||||
type = "even";
|
||||
xml.stag(QString("page-margins type=\"%1\"").arg(type));
|
||||
xml.tag("left-margin", evenLeftMargin() * t);
|
||||
xml.tag("right-margin", evenRightMargin() * t);
|
||||
xml.tag("top-margin", evenTopMargin() * t);
|
||||
xml.tag("bottom-margin", evenBottomMargin() * t);
|
||||
xml.etag();
|
||||
type = "odd";
|
||||
}
|
||||
xml.stag(QString("page-margins type=\"%1\"").arg(type));
|
||||
xml.tag("left-margin", oddLeftMargin() * t);
|
||||
xml.tag("right-margin", oddRightMargin() * t);
|
||||
xml.tag("top-margin", oddTopMargin() * t);
|
||||
xml.tag("bottom-margin", oddBottomMargin() * t);
|
||||
xml.etag();
|
||||
|
||||
xml.etag();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
//=============================================================================
|
||||
// MuseScore
|
||||
// Music Composition & Notation
|
||||
//
|
||||
// Copyright (C) 2017 Werner Schweer
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License version 2
|
||||
// as published by the Free Software Foundation and appearing in
|
||||
// the file LICENCE.GPL
|
||||
//=============================================================================
|
||||
|
||||
#ifndef __PAGEFORMAT_H__
|
||||
#define __PAGEFORMAT_H__
|
||||
|
||||
#include "config.h"
|
||||
|
||||
namespace Ms {
|
||||
|
||||
class XmlReader;
|
||||
class XmlWriter;
|
||||
|
||||
//---------------------------------------------------------
|
||||
// @@ PageFormat
|
||||
//---------------------------------------------------------
|
||||
|
||||
class PageFormat {
|
||||
QSizeF _size;
|
||||
qreal _printableWidth; // _width - left margin - right margin
|
||||
qreal _evenLeftMargin; // values in inch
|
||||
qreal _oddLeftMargin;
|
||||
qreal _evenTopMargin;
|
||||
qreal _evenBottomMargin;
|
||||
qreal _oddTopMargin;
|
||||
qreal _oddBottomMargin;
|
||||
bool _twosided;
|
||||
|
||||
public:
|
||||
PageFormat();
|
||||
|
||||
const QSizeF& size() const { return _size; } // size in inch
|
||||
qreal width() const { return _size.width(); }
|
||||
qreal height() const { return _size.height(); }
|
||||
void setSize(const QSizeF& s) { _size = s; }
|
||||
|
||||
void read(XmlReader&);
|
||||
void write(XmlWriter&) const;
|
||||
qreal evenLeftMargin() const { return _evenLeftMargin; }
|
||||
qreal oddLeftMargin() const { return _oddLeftMargin; }
|
||||
qreal evenTopMargin() const { return _evenTopMargin; }
|
||||
qreal evenBottomMargin() const { return _evenBottomMargin; }
|
||||
qreal oddTopMargin() const { return _oddTopMargin; }
|
||||
qreal oddBottomMargin() const { return _oddBottomMargin; }
|
||||
qreal printableWidth() const { return _printableWidth; }
|
||||
|
||||
void setEvenLeftMargin(qreal val) { _evenLeftMargin = val; }
|
||||
void setOddLeftMargin(qreal val) { _oddLeftMargin = val; }
|
||||
void setEvenTopMargin(qreal val) { _evenTopMargin = val; }
|
||||
void setEvenBottomMargin(qreal val) { _evenBottomMargin = val; }
|
||||
void setOddTopMargin(qreal val) { _oddTopMargin = val; }
|
||||
void setOddBottomMargin(qreal val) { _oddBottomMargin = val; }
|
||||
void setPrintableWidth(qreal val) { _printableWidth = val; }
|
||||
|
||||
bool twosided() const { return _twosided; }
|
||||
void setTwosided(bool val) { _twosided = val; }
|
||||
|
||||
// convenience functions
|
||||
qreal evenRightMargin() const { return _size.width() - _printableWidth - _evenLeftMargin; }
|
||||
qreal oddRightMargin() const { return _size.width() - _printableWidth - _oddLeftMargin; }
|
||||
};
|
||||
|
||||
} // namespace Ms
|
||||
#endif
|
||||
|
||||
|
|
@ -49,6 +49,55 @@
|
|||
|
||||
namespace Ms {
|
||||
|
||||
//---------------------------------------------------------
|
||||
// @@ PageFormat
|
||||
//---------------------------------------------------------
|
||||
|
||||
class PageFormat {
|
||||
QSizeF _size;
|
||||
qreal _printableWidth; // _width - left margin - right margin
|
||||
qreal _evenLeftMargin; // values in inch
|
||||
qreal _oddLeftMargin;
|
||||
qreal _evenTopMargin;
|
||||
qreal _evenBottomMargin;
|
||||
qreal _oddTopMargin;
|
||||
qreal _oddBottomMargin;
|
||||
bool _twosided;
|
||||
|
||||
public:
|
||||
PageFormat();
|
||||
|
||||
const QSizeF& size() const { return _size; } // size in inch
|
||||
qreal width() const { return _size.width(); }
|
||||
qreal height() const { return _size.height(); }
|
||||
void setSize(const QSizeF& s) { _size = s; }
|
||||
|
||||
void read(XmlReader&);
|
||||
void write(XmlWriter&) const;
|
||||
qreal evenLeftMargin() const { return _evenLeftMargin; }
|
||||
qreal oddLeftMargin() const { return _oddLeftMargin; }
|
||||
qreal evenTopMargin() const { return _evenTopMargin; }
|
||||
qreal evenBottomMargin() const { return _evenBottomMargin; }
|
||||
qreal oddTopMargin() const { return _oddTopMargin; }
|
||||
qreal oddBottomMargin() const { return _oddBottomMargin; }
|
||||
qreal printableWidth() const { return _printableWidth; }
|
||||
|
||||
void setEvenLeftMargin(qreal val) { _evenLeftMargin = val; }
|
||||
void setOddLeftMargin(qreal val) { _oddLeftMargin = val; }
|
||||
void setEvenTopMargin(qreal val) { _evenTopMargin = val; }
|
||||
void setEvenBottomMargin(qreal val) { _evenBottomMargin = val; }
|
||||
void setOddTopMargin(qreal val) { _oddTopMargin = val; }
|
||||
void setOddBottomMargin(qreal val) { _oddBottomMargin = val; }
|
||||
void setPrintableWidth(qreal val) { _printableWidth = val; }
|
||||
|
||||
bool twosided() const { return _twosided; }
|
||||
void setTwosided(bool val) { _twosided = val; }
|
||||
|
||||
// convenience functions
|
||||
qreal evenRightMargin() const { return _size.width() - _printableWidth - _evenLeftMargin; }
|
||||
qreal oddRightMargin() const { return _size.width() - _printableWidth - _oddLeftMargin; }
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
// StyleVal206
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -1391,6 +1440,11 @@ static void readStaffContent(Score* score, XmlReader& e)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// readStyle
|
||||
//---------------------------------------------------------
|
||||
|
||||
static void readStyle(MStyle* style, XmlReader& e)
|
||||
{
|
||||
QString oldChordDescriptionFile = style->value(StyleIdx::chordDescriptionFile).toString();
|
||||
|
|
@ -1416,9 +1470,12 @@ static void readStyle(MStyle* style, XmlReader& e)
|
|||
else if (tag == "Spatium")
|
||||
style->set(StyleIdx::spatium, e.readDouble() * DPMM);
|
||||
else if (tag == "page-layout") {
|
||||
e.skipCurrentElement();
|
||||
#if 0 // TODO
|
||||
PageFormat pf = *style->pageFormat();
|
||||
pf.read(e);
|
||||
style->setPageFormat(pf);
|
||||
#endif
|
||||
}
|
||||
else if (tag == "displayInConcertPitch")
|
||||
style->set(StyleIdx::concertPitch, QVariant(bool(e.readInt())));
|
||||
|
|
@ -1433,11 +1490,8 @@ static void readStyle(MStyle* style, XmlReader& e)
|
|||
}
|
||||
chordListTag = true;
|
||||
}
|
||||
else {
|
||||
// QString val(e.readElementText());
|
||||
// style->convertToUnit(tag, val);
|
||||
else
|
||||
style->readProperties(e);
|
||||
}
|
||||
}
|
||||
|
||||
// if we just specified a new chord description file
|
||||
|
|
@ -1607,20 +1661,8 @@ static bool readScore(Score* score, XmlReader& e)
|
|||
m->addExcerpt(ex);
|
||||
}
|
||||
}
|
||||
else if (tag == "PageList") {
|
||||
else if (tag == "PageList")
|
||||
e.skipCurrentElement();
|
||||
#if 0
|
||||
while (e.readNextStartElement()) {
|
||||
if (e.name() == "Page") {
|
||||
Page* page = new Page(score);
|
||||
score->pages().append(page);
|
||||
page->read(e);
|
||||
}
|
||||
else
|
||||
e.unknown();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else if (tag == "name") {
|
||||
QString n = e.readElementText();
|
||||
if (!score->isMaster()) //ignore the name if it's not a child score
|
||||
|
|
@ -1713,6 +1755,72 @@ static bool readScore(Score* score, XmlReader& e)
|
|||
return true;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// read
|
||||
// <page-layout>
|
||||
// <page-height>
|
||||
// <page-width>
|
||||
// <landscape>1</landscape>
|
||||
// <page-margins type="both">
|
||||
// <left-margin>28.3465</left-margin>
|
||||
// <right-margin>28.3465</right-margin>
|
||||
// <top-margin>28.3465</top-margin>
|
||||
// <bottom-margin>56.6929</bottom-margin>
|
||||
// </page-margins>
|
||||
// </page-layout>
|
||||
//---------------------------------------------------------
|
||||
|
||||
void PageFormat::read(XmlReader& e)
|
||||
{
|
||||
qreal _oddRightMargin = 0.0;
|
||||
qreal _evenRightMargin = 0.0;
|
||||
QString type;
|
||||
|
||||
while (e.readNextStartElement()) {
|
||||
const QStringRef& tag(e.name());
|
||||
if (tag == "page-margins") {
|
||||
type = e.attribute("type","both");
|
||||
qreal lm = 0.0, rm = 0.0, tm = 0.0, bm = 0.0;
|
||||
while (e.readNextStartElement()) {
|
||||
const QStringRef& tag(e.name());
|
||||
qreal val = e.readDouble() * 0.5 / PPI;
|
||||
if (tag == "left-margin")
|
||||
lm = val;
|
||||
else if (tag == "right-margin")
|
||||
rm = val;
|
||||
else if (tag == "top-margin")
|
||||
tm = val;
|
||||
else if (tag == "bottom-margin")
|
||||
bm = val;
|
||||
else
|
||||
e.unknown();
|
||||
}
|
||||
_twosided = type == "odd" || type == "even";
|
||||
if (type == "odd" || type == "both") {
|
||||
_oddLeftMargin = lm;
|
||||
_oddRightMargin = rm;
|
||||
_oddTopMargin = tm;
|
||||
_oddBottomMargin = bm;
|
||||
}
|
||||
if (type == "even" || type == "both") {
|
||||
_evenLeftMargin = lm;
|
||||
_evenRightMargin = rm;
|
||||
_evenTopMargin = tm;
|
||||
_evenBottomMargin = bm;
|
||||
}
|
||||
}
|
||||
else if (tag == "page-height")
|
||||
_size.rheight() = e.readDouble() * 0.5 / PPI;
|
||||
else if (tag == "page-width")
|
||||
_size.rwidth() = e.readDouble() * .5 / PPI;
|
||||
else
|
||||
e.unknown();
|
||||
}
|
||||
qreal w1 = _size.width() - _oddLeftMargin - _oddRightMargin;
|
||||
qreal w2 = _size.width() - _evenLeftMargin - _evenRightMargin;
|
||||
_printableWidth = qMin(w1, w2); // silently adjust right margins
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// read206
|
||||
// import old version > 1.3 and < 2.x files
|
||||
|
|
@ -1720,19 +1828,15 @@ static bool readScore(Score* score, XmlReader& e)
|
|||
|
||||
Score::FileError MasterScore::read206(XmlReader& e)
|
||||
{
|
||||
qDebug("read206");
|
||||
|
||||
for (unsigned int i = 0; i < sizeof(style206)/sizeof(*style206); ++i)
|
||||
style().set(style206[i].idx, style206[i].val);
|
||||
// old text style default
|
||||
#if 0
|
||||
TextStyle ts = style().textStyle("Rehearsal Mark");
|
||||
ts.setSquare(false);
|
||||
ts.setFrameRound(20);
|
||||
style().setTextStyle(ts);
|
||||
ts = style().textStyle("Dynamics");
|
||||
ts.setItalic(false);
|
||||
style().setTextStyle(ts);
|
||||
#endif
|
||||
qDebug("read206");
|
||||
style().set(StyleIdx::rehearsalMarkFrameSquare, false);
|
||||
style().set(StyleIdx::rehearsalMarkFrameRound, 20);
|
||||
style().set(StyleIdx::dynamicsFontItalic, false);
|
||||
|
||||
while (e.readNextStartElement()) {
|
||||
const QStringRef& tag(e.name());
|
||||
if (tag == "programVersion") {
|
||||
|
|
|
|||
|
|
@ -266,24 +266,37 @@ Score::Score(MasterScore* parent)
|
|||
: Score{}
|
||||
{
|
||||
_masterScore = parent;
|
||||
// TODO
|
||||
// if (MScore::defaultStyleForParts())
|
||||
// style() = *MScore::defaultStyleForParts();
|
||||
// else {
|
||||
QString partStyle = QSettings().value("partStyle").toString();
|
||||
if (!partStyle.isEmpty())
|
||||
style() = MScore::defaultStyleForParts();
|
||||
else {
|
||||
// inherit most style settings from parent
|
||||
style() = parent->style();
|
||||
|
||||
// but borrow defaultStyle page layout settings
|
||||
const PageFormat* pf = MScore::defaultStyle().pageFormat();
|
||||
style().setPageFormat(*pf);
|
||||
style().set(StyleIdx::spatium, MScore::defaultStyle().value(StyleIdx::spatium));
|
||||
for (auto i :
|
||||
{
|
||||
StyleIdx::pageWidth,
|
||||
StyleIdx::pageHeight,
|
||||
StyleIdx::pagePrintableWidth,
|
||||
StyleIdx::pageEvenLeftMargin,
|
||||
StyleIdx::pageOddLeftMargin,
|
||||
StyleIdx::pageEvenTopMargin,
|
||||
StyleIdx::pageEvenBottomMargin,
|
||||
StyleIdx::pageOddTopMargin,
|
||||
StyleIdx::pageOddBottomMargin,
|
||||
StyleIdx::pageTwosided,
|
||||
StyleIdx::spatium
|
||||
} ) {
|
||||
style().set(i, MScore::defaultStyle().value(i));
|
||||
}
|
||||
|
||||
// and force some style settings that just make sense for parts
|
||||
style().set(StyleIdx::concertPitch, false);
|
||||
style().set(StyleIdx::createMultiMeasureRests, true);
|
||||
style().set(StyleIdx::dividerLeft, false);
|
||||
style().set(StyleIdx::dividerRight, false);
|
||||
// }
|
||||
}
|
||||
_synthesizerState = parent->_synthesizerState;
|
||||
}
|
||||
|
||||
|
|
@ -2421,7 +2434,7 @@ void Score::sortStaves(QList<int>& dst)
|
|||
|
||||
void Score::cmdConcertPitchChanged(bool flag, bool /*useDoubleSharpsFlats*/)
|
||||
{
|
||||
undo(new ChangeStyleVal(this, StyleIdx::concertPitch, flag)); // change style flag
|
||||
undoChangeStyleVal(StyleIdx::concertPitch, flag); // change style flag
|
||||
|
||||
for (Staff* staff : _staves) {
|
||||
if (staff->staffType(0)->group() == StaffGroup::PERCUSSION) // TODO
|
||||
|
|
@ -3173,7 +3186,7 @@ qreal Score::tempo(int tick) const
|
|||
|
||||
qreal Score::loWidth() const
|
||||
{
|
||||
return pageFormat()->size().width() * DPI;
|
||||
return styleD(StyleIdx::pageWidth) * DPI;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -3182,7 +3195,7 @@ qreal Score::loWidth() const
|
|||
|
||||
qreal Score::loHeight() const
|
||||
{
|
||||
return pageFormat()->size().height() * DPI;
|
||||
return styleD(StyleIdx::pageHeight) * DPI;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -4112,6 +4125,7 @@ void Score::changeVoice(int voice)
|
|||
endCmd();
|
||||
}
|
||||
|
||||
#if 0
|
||||
//---------------------------------------------------------
|
||||
// cropPage - crop a single page score to the content
|
||||
/// margins will be applied on the 4 sides
|
||||
|
|
@ -4124,9 +4138,6 @@ void Score::cropPage(qreal margins)
|
|||
if (page) {
|
||||
QRectF ttbox = page->tbbox();
|
||||
|
||||
PageFormat* curFormat = pageFormat();
|
||||
PageFormat f = *curFormat;
|
||||
|
||||
qreal margin = margins / INCH;
|
||||
f.setSize(QSizeF((ttbox.width() / DPI) + 2 * margin, (ttbox.height()/ DPI) + 2 * margin));
|
||||
|
||||
|
|
@ -4144,6 +4155,7 @@ void Score::cropPage(qreal margins)
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
//---------------------------------------------------------
|
||||
// getProperty
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ class MuseScoreView;
|
|||
class Note;
|
||||
class Omr;
|
||||
class Page;
|
||||
class PageFormat;
|
||||
class Parameter;
|
||||
class Part;
|
||||
class RepeatList;
|
||||
|
|
@ -606,8 +605,6 @@ class Score : public ScoreElement {
|
|||
void undoChangeInvisible(Element*, bool);
|
||||
void undoChangeBracketSpan(Staff* staff, int column, int span);
|
||||
void undoChangeTuning(Note*, qreal);
|
||||
void undoChangePageFormat(PageFormat*);
|
||||
void undoChangePageFormat(PageFormat*, qreal spatium, int);
|
||||
void undoChangeUserMirror(Note*, MScore::DirectionH);
|
||||
void undoChangeKeySig(Staff* ostaff, int tick, KeySigEvent);
|
||||
void undoChangeClef(Staff* ostaff, Segment*, ClefType st);
|
||||
|
|
@ -621,6 +618,7 @@ class Score : public ScoreElement {
|
|||
void undoRemoveBracket(Bracket*);
|
||||
void undoInsertTime(int tick, int len);
|
||||
void undoChangeBarLine(Measure*, BarLineType, bool beginBarLine = false);
|
||||
void undoChangeStyleVal(StyleIdx idx, const QVariant& v);
|
||||
|
||||
void setGraceNote(Chord*, int pitch, NoteType type, int len);
|
||||
|
||||
|
|
@ -802,9 +800,6 @@ class Score : public ScoreElement {
|
|||
|
||||
qreal spatium() const { return styleD(StyleIdx::spatium); }
|
||||
void setSpatium(qreal v) { style().set(StyleIdx::spatium, v); }
|
||||
PageFormat* pageFormat() { return style().pageFormat(); }
|
||||
const PageFormat* pageFormat() const { return style().pageFormat(); }
|
||||
void setPageFormat(const PageFormat& pf) { style().setPageFormat(pf); }
|
||||
|
||||
bool genCourtesyTimesig() const { return styleB(StyleIdx::genCourtesyTimesig); }
|
||||
bool genCourtesyClef() const { return styleB(StyleIdx::genCourtesyClef); }
|
||||
|
|
@ -1104,7 +1099,7 @@ class Score : public ScoreElement {
|
|||
QString nextRehearsalMarkText(RehearsalMark* previous, RehearsalMark* current) const;
|
||||
|
||||
//@ ??
|
||||
Q_INVOKABLE void cropPage(qreal margins);
|
||||
// Q_INVOKABLE void cropPage(qreal margins);
|
||||
bool sanityCheck(const QString& name = QString());
|
||||
|
||||
bool checkKeys();
|
||||
|
|
|
|||
|
|
@ -51,6 +51,17 @@ struct StyleType {
|
|||
#define MM(x) ((x)/INCH)
|
||||
|
||||
static const StyleType styleTypes[] {
|
||||
{ StyleIdx::pageWidth, "pageWidth", 210.0/INCH },
|
||||
{ StyleIdx::pageHeight, "pageHeight", 297.0/INCH }, // A4
|
||||
{ StyleIdx::pagePrintableWidth, "pagePrintableWidth", 190.0/INCH },
|
||||
{ StyleIdx::pageEvenLeftMargin, "pageEvenLeftMargin", 10.0/INCH },
|
||||
{ StyleIdx::pageOddLeftMargin, "pageOddLeftMargin", 10.0/INCH },
|
||||
{ StyleIdx::pageEvenTopMargin, "pageEvenTopMargin", 10.0/INCH },
|
||||
{ StyleIdx::pageEvenBottomMargin, "pageEvenBottomMargin", 20.0/INCH },
|
||||
{ StyleIdx::pageOddTopMargin, "pageOddTopMargin", 10.0/INCH },
|
||||
{ StyleIdx::pageOddBottomMargin, "pageOddBottomMargin", 20.0/INCH },
|
||||
{ StyleIdx::pageTwosided, "pageTwosided", true },
|
||||
|
||||
{ StyleIdx::staffUpperBorder, "staffUpperBorder", Spatium(7.0) },
|
||||
{ StyleIdx::staffLowerBorder, "staffLowerBorder", Spatium(7.0) },
|
||||
{ StyleIdx::staffDistance, "staffDistance", Spatium(6.5) },
|
||||
|
|
@ -1376,7 +1387,8 @@ void MStyle::load(XmlReader& e)
|
|||
else if (tag == "Spatium")
|
||||
set(StyleIdx::spatium, e.readDouble() * DPMM);
|
||||
else if (tag == "page-layout")
|
||||
_pageFormat.read(e);
|
||||
// _pageFormat.read(e);
|
||||
e.skipCurrentElement();
|
||||
else if (tag == "displayInConcertPitch")
|
||||
set(StyleIdx::concertPitch, QVariant(bool(e.readInt())));
|
||||
else if (tag == "ChordList") {
|
||||
|
|
@ -1452,22 +1464,10 @@ void MStyle::save(XmlWriter& xml, bool optimize)
|
|||
_chordList.write(xml);
|
||||
xml.etag();
|
||||
}
|
||||
// if (!MScore::saveTemplateMode || (_pageFormat.name() != "A4" && _pageFormat.name() != "Letter"))
|
||||
if (!MScore::saveTemplateMode)
|
||||
_pageFormat.write(xml);
|
||||
xml.tag("Spatium", value(StyleIdx::spatium).toDouble() / DPMM);
|
||||
xml.etag();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// setPageFormat
|
||||
//---------------------------------------------------------
|
||||
|
||||
void MStyle::setPageFormat(const PageFormat& pf)
|
||||
{
|
||||
_pageFormat = pf;
|
||||
}
|
||||
|
||||
#ifndef NDEBUG
|
||||
//---------------------------------------------------------
|
||||
// checkStyles
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
#ifndef __STYLE_H__
|
||||
#define __STYLE_H__
|
||||
|
||||
#include "pageformat.h"
|
||||
#include "chordlist.h"
|
||||
|
||||
namespace Ms {
|
||||
|
|
@ -21,7 +20,6 @@ namespace Ms {
|
|||
enum class P_ID : int;
|
||||
class XmlWriter;
|
||||
struct ChordDescription;
|
||||
class PageFormat;
|
||||
class Element;
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -32,6 +30,18 @@ class Element;
|
|||
|
||||
enum class StyleIdx {
|
||||
NOSTYLE = -1,
|
||||
|
||||
pageWidth,
|
||||
pageHeight,
|
||||
pagePrintableWidth,
|
||||
pageEvenLeftMargin,
|
||||
pageOddLeftMargin,
|
||||
pageEvenTopMargin,
|
||||
pageEvenBottomMargin,
|
||||
pageOddTopMargin,
|
||||
pageOddBottomMargin,
|
||||
pageTwosided,
|
||||
|
||||
staffUpperBorder,
|
||||
staffLowerBorder,
|
||||
staffDistance,
|
||||
|
|
@ -724,8 +734,6 @@ class MStyle {
|
|||
std::array<qreal, int(StyleIdx::STYLES)> _precomputedValues;
|
||||
|
||||
ChordList _chordList;
|
||||
PageFormat _pageFormat;
|
||||
|
||||
bool _customChordList; // if true, chordlist will be saved as part of score
|
||||
|
||||
public:
|
||||
|
|
@ -748,10 +756,6 @@ class MStyle {
|
|||
void save(XmlWriter& xml, bool optimize);
|
||||
bool readProperties(XmlReader&);
|
||||
|
||||
PageFormat* pageFormat() { return &_pageFormat; }
|
||||
const PageFormat* pageFormat() const { return &_pageFormat; }
|
||||
void setPageFormat(const PageFormat& pf);
|
||||
|
||||
static const char* valueType(const StyleIdx);
|
||||
static const char* valueName(const StyleIdx);
|
||||
static StyleIdx styleIdx(const QString& name);
|
||||
|
|
|
|||
|
|
@ -402,6 +402,15 @@ void Score::undoPropertyChanged(ScoreElement* e, P_ID t, const QVariant& st)
|
|||
undoStack()->push1(new ChangeProperty(e, t, st));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// undoChangeStyleVal
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Score::undoChangeStyleVal(StyleIdx idx, const QVariant& v)
|
||||
{
|
||||
undo(new ChangeStyleVal(this, idx, v));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// undoChangeElement
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -1662,24 +1671,6 @@ void Score::undoChangeUserMirror(Note* n, MScore::DirectionH d)
|
|||
undoChangeProperty(n, P_ID::MIRROR_HEAD, int(d));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// undoChangePageFormat
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Score::undoChangePageFormat(PageFormat* p)
|
||||
{
|
||||
undoChangePageFormat(p, spatium(), pageNumberOffset());
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// undoChangePageFormat
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Score::undoChangePageFormat(PageFormat* p, qreal v, int pageOffset)
|
||||
{
|
||||
undo(new ChangePageFormat(this, p, v, pageOffset));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// undoChangeTpc
|
||||
// TODO-TPC: check
|
||||
|
|
@ -2468,47 +2459,6 @@ void ChangePatch::flip()
|
|||
channel->updateInitList();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// ChangePageFormat
|
||||
//---------------------------------------------------------
|
||||
|
||||
ChangePageFormat::ChangePageFormat(Score* cs, PageFormat* p, qreal s, int po)
|
||||
{
|
||||
score = cs;
|
||||
pf = new PageFormat;
|
||||
*pf = *p;
|
||||
spatium = s;
|
||||
pageOffset = po;
|
||||
}
|
||||
|
||||
ChangePageFormat::~ChangePageFormat()
|
||||
{
|
||||
delete pf;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// flip
|
||||
//---------------------------------------------------------
|
||||
|
||||
void ChangePageFormat::flip()
|
||||
{
|
||||
PageFormat f = *(score->pageFormat());
|
||||
qreal os = score->spatium();
|
||||
int po = score->pageNumberOffset();
|
||||
|
||||
score->setPageFormat(*pf);
|
||||
if (os != spatium) {
|
||||
score->setSpatium(spatium);
|
||||
score->spatiumChanged(os, spatium);
|
||||
}
|
||||
score->setPageNumberOffset(pageOffset);
|
||||
score->setLayoutAll();
|
||||
|
||||
*pf = f;
|
||||
spatium = os;
|
||||
pageOffset = po;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// ChangeStaff
|
||||
//---------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ class Dynamic;
|
|||
class Selection;
|
||||
class Text;
|
||||
struct Channel;
|
||||
class PageFormat;
|
||||
class TextStyle;
|
||||
class Tuplet;
|
||||
class KeySig;
|
||||
|
|
@ -570,26 +569,6 @@ class ChangePatch : public UndoCommand {
|
|||
UNDO_NAME("ChangePatch")
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
// ChangePageFormat
|
||||
//---------------------------------------------------------
|
||||
|
||||
class ChangePageFormat : public UndoCommand {
|
||||
Score* score;
|
||||
PageFormat* pf;
|
||||
qreal spatium;
|
||||
int pageOffset;
|
||||
|
||||
void flip();
|
||||
|
||||
public:
|
||||
ChangePageFormat(Score*, PageFormat*, qreal sp, int po);
|
||||
~ChangePageFormat();
|
||||
virtual void undo() { flip(); }
|
||||
virtual void redo() { flip(); }
|
||||
UNDO_NAME("ChangePageFormat")
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
// ChangeStaff
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -642,37 +621,6 @@ class ChangePart : public UndoCommand {
|
|||
UNDO_NAME("ChangePart")
|
||||
};
|
||||
|
||||
#if 0
|
||||
//---------------------------------------------------------
|
||||
// ChangeTextStyle
|
||||
//---------------------------------------------------------
|
||||
|
||||
class ChangeTextStyle : public UndoCommand {
|
||||
Score* score;
|
||||
TextStyle style;
|
||||
void flip();
|
||||
|
||||
public:
|
||||
ChangeTextStyle(Score*, const TextStyle& style);
|
||||
UNDO_NAME("ChangeTextStyle")
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
// AddTextStyle
|
||||
//---------------------------------------------------------
|
||||
|
||||
class AddTextStyle : public UndoCommand {
|
||||
Score* score;
|
||||
TextStyle style;
|
||||
|
||||
public:
|
||||
AddTextStyle(Score* s, const TextStyle& st) : score(s), style(st) {}
|
||||
virtual void undo();
|
||||
virtual void redo();
|
||||
UNDO_NAME("AddTextStyle")
|
||||
};
|
||||
#endif
|
||||
|
||||
//---------------------------------------------------------
|
||||
// ChangeStyle
|
||||
//---------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1040,6 +1040,7 @@ void ExportMusicXml::calcDivisions()
|
|||
#endif
|
||||
}
|
||||
|
||||
#if 0
|
||||
//---------------------------------------------------------
|
||||
// writePageFormat
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -1070,6 +1071,7 @@ static void writePageFormat(const PageFormat* pf, XmlWriter& xml, double convers
|
|||
|
||||
xml.etag();
|
||||
}
|
||||
#endif
|
||||
|
||||
//---------------------------------------------------------
|
||||
// defaults
|
||||
|
|
@ -1084,9 +1086,9 @@ static void defaults(XmlWriter& xml, Score* s, double& millimeters, const int& t
|
|||
xml.tag("millimeters", millimeters);
|
||||
xml.tag("tenths", tenths);
|
||||
xml.etag();
|
||||
const PageFormat* pf = s->pageFormat();
|
||||
if (pf)
|
||||
writePageFormat(pf, xml, INCH / millimeters * tenths);
|
||||
//TODO:ws const PageFormat* pf = s->pageFormat();
|
||||
// if (pf)
|
||||
// writePageFormat(pf, xml, INCH / millimeters * tenths);
|
||||
|
||||
// TODO: also write default system layout here
|
||||
// when exporting only manual or no breaks, system-distance is not written at all
|
||||
|
|
@ -1153,14 +1155,12 @@ void ExportMusicXml::credits(XmlWriter& xml)
|
|||
QString rights = _score->metaTag("copyright");
|
||||
|
||||
// determine page formatting
|
||||
const PageFormat* pf = _score->pageFormat();
|
||||
if (!pf) return;
|
||||
const double h = getTenthsFromInches(pf->size().height());
|
||||
const double w = getTenthsFromInches(pf->size().width());
|
||||
const double lm = getTenthsFromInches(pf->oddLeftMargin());
|
||||
const double rm = getTenthsFromInches(pf->oddRightMargin());
|
||||
const double h = getTenthsFromInches(_score->styleD(StyleIdx::pageHeight));
|
||||
const double w = getTenthsFromInches(_score->styleD(StyleIdx::pageWidth));
|
||||
const double lm = getTenthsFromInches(_score->styleD(StyleIdx::pageOddLeftMargin));
|
||||
const double rm = getTenthsFromInches(_score->styleD(StyleIdx::pagePrintableWidth) - _score->styleD(StyleIdx::pageOddLeftMargin));
|
||||
//const double tm = getTenthsFromInches(pf->oddTopMargin());
|
||||
const double bm = getTenthsFromInches(pf->oddBottomMargin());
|
||||
const double bm = getTenthsFromInches(_score->styleD(StyleIdx::pageOddBottomMargin));
|
||||
//qDebug("page h=%g w=%g lm=%g rm=%g tm=%g bm=%g", h, w, lm, rm, tm, bm);
|
||||
|
||||
// write the credits
|
||||
|
|
@ -2395,8 +2395,7 @@ void ExportMusicXml::chord(Chord* chord, int staff, const std::vector<Lyrics*>*
|
|||
qDebug(" newtick=%d", tick);
|
||||
#endif
|
||||
|
||||
const PageFormat* pf = _score->pageFormat();
|
||||
const double pageHeight = getTenthsFromInches(pf->size().height());
|
||||
const double pageHeight = getTenthsFromInches(_score->styleD(StyleIdx::pageHeight));
|
||||
// const double pageWidth = getTenthsFromInches(pf->size().width());
|
||||
|
||||
for (Note* note : nl) {
|
||||
|
|
@ -2405,7 +2404,7 @@ void ExportMusicXml::chord(Chord* chord, int staff, const std::vector<Lyrics*>*
|
|||
attr.doAttr(xml, false);
|
||||
QString noteTag = QString("note");
|
||||
|
||||
if (preferences.musicxmlExportLayout && pf) {
|
||||
if (preferences.musicxmlExportLayout) {
|
||||
double measureX = getTenthsFromDots(chord->measure()->pagePos().x());
|
||||
double measureY = pageHeight - getTenthsFromDots(chord->measure()->pagePos().y());
|
||||
double noteX = getTenthsFromDots(note->pagePos().x());
|
||||
|
|
@ -4513,11 +4512,11 @@ void ExportMusicXml::print(Measure* m, int idx, int staffCount, int staves)
|
|||
|
||||
if (doLayout) {
|
||||
xml.stag(QString("print%1").arg(newThing));
|
||||
const PageFormat* pf = score()->pageFormat();
|
||||
const double pageWidth = getTenthsFromInches(pf->size().width());
|
||||
const double lm = getTenthsFromInches(pf->oddLeftMargin());
|
||||
const double rm = getTenthsFromInches(pf->oddRightMargin());
|
||||
const double tm = getTenthsFromInches(pf->oddTopMargin());
|
||||
const double pageWidth = getTenthsFromInches(score()->styleD(StyleIdx::pageWidth));
|
||||
const double lm = getTenthsFromInches(score()->styleD(StyleIdx::pageOddLeftMargin));
|
||||
const double rm = getTenthsFromInches(score()->styleD(StyleIdx::pageWidth)
|
||||
- score()->styleD(StyleIdx::pagePrintableWidth) - score()->styleD(StyleIdx::pageOddLeftMargin));
|
||||
const double tm = getTenthsFromInches(score()->styleD(StyleIdx::pageOddTopMargin));
|
||||
|
||||
// System Layout
|
||||
|
||||
|
|
|
|||
|
|
@ -1477,12 +1477,10 @@ void MuseScore::printFile()
|
|||
}
|
||||
|
||||
QPrinter printerDev(QPrinter::HighResolution);
|
||||
const PageFormat* pf = cs->pageFormat();
|
||||
QPageSize ps(QPageSize::id(pf->size(), QPageSize::Inch));
|
||||
QSizeF size(cs->styleD(StyleIdx::pageWidth), cs->styleD(StyleIdx::pageHeight));
|
||||
QPageSize ps(QPageSize::id(size, QPageSize::Inch));
|
||||
printerDev.setPageSize(ps);
|
||||
printerDev.setPageOrientation(
|
||||
pf->size().width() > pf->size().height() ? QPageLayout::Landscape : QPageLayout::Portrait
|
||||
);
|
||||
printerDev.setPageOrientation(size.width() > size.height() ? QPageLayout::Landscape : QPageLayout::Portrait);
|
||||
|
||||
printerDev.setCreator("MuseScore Version: " VERSION);
|
||||
printerDev.setFullPage(true);
|
||||
|
|
@ -1899,8 +1897,9 @@ bool MuseScore::savePdf(Score* cs, const QString& saveName)
|
|||
|
||||
QPdfWriter printerDev(saveName);
|
||||
printerDev.setResolution(preferences.exportPdfDpi);
|
||||
const PageFormat* pf = cs->pageFormat();
|
||||
printerDev.setPageSize(QPageSize(pf->size(), QPageSize::Inch));
|
||||
QSizeF size(cs->styleD(StyleIdx::pageWidth), cs->styleD(StyleIdx::pageHeight));
|
||||
QPageSize ps(QPageSize::id(size, QPageSize::Inch));
|
||||
printerDev.setPageSize(ps);
|
||||
|
||||
printerDev.setCreator("MuseScore Version: " VERSION);
|
||||
if (!printerDev.setPageMargins(QMarginsF()))
|
||||
|
|
@ -1923,9 +1922,9 @@ bool MuseScore::savePdf(Score* cs, const QString& saveName)
|
|||
p.setRenderHint(QPainter::Antialiasing, true);
|
||||
p.setRenderHint(QPainter::TextAntialiasing, true);
|
||||
|
||||
p.setViewport(QRect(0.0, 0.0, pf->size().width() * printerDev.logicalDpiX(),
|
||||
pf->size().height()*printerDev.logicalDpiY()));
|
||||
p.setWindow(QRect(0.0, 0.0, pf->size().width() * DPI, pf->size().height() * DPI));
|
||||
p.setViewport(QRect(0.0, 0.0, size.width() * printerDev.logicalDpiX(),
|
||||
size.height()*printerDev.logicalDpiY()));
|
||||
p.setWindow(QRect(0.0, 0.0, size.width() * DPI, size.height() * DPI));
|
||||
|
||||
double pr = MScore::pixelRatio;
|
||||
MScore::pixelRatio = DPI / printerDev.logicalDpiX();
|
||||
|
|
@ -1955,8 +1954,9 @@ bool MuseScore::savePdf(QList<Score*> cs, const QString& saveName)
|
|||
|
||||
QPrinter printerDev(QPrinter::HighResolution);
|
||||
printerDev.setResolution(preferences.exportPdfDpi);
|
||||
const PageFormat* pf = firstScore->pageFormat();
|
||||
printerDev.setPaperSize(pf->size(), QPrinter::Inch);
|
||||
|
||||
QSizeF size(firstScore->styleD(StyleIdx::pageWidth), firstScore->styleD(StyleIdx::pageHeight));
|
||||
printerDev.setPaperSize(size, QPrinter::Inch);
|
||||
|
||||
printerDev.setCreator("MuseScore Version: " VERSION);
|
||||
printerDev.setFullPage(true);
|
||||
|
|
@ -1980,9 +1980,9 @@ bool MuseScore::savePdf(QList<Score*> cs, const QString& saveName)
|
|||
p.setRenderHint(QPainter::Antialiasing, true);
|
||||
p.setRenderHint(QPainter::TextAntialiasing, true);
|
||||
|
||||
p.setViewport(QRect(0.0, 0.0, pf->size().width() * printerDev.logicalDpiX(),
|
||||
pf->size().height()*printerDev.logicalDpiY()));
|
||||
p.setWindow(QRect(0.0, 0.0, pf->size().width() * DPI, pf->size().height() * DPI));
|
||||
p.setViewport(QRect(0.0, 0.0, size.width() * printerDev.logicalDpiX(),
|
||||
size.height() * printerDev.logicalDpiY()));
|
||||
p.setWindow(QRect(0.0, 0.0, size.width() * DPI, size.height() * DPI));
|
||||
|
||||
double pr = MScore::pixelRatio;
|
||||
MScore::pixelRatio = DPI / printerDev.logicalDpiX();
|
||||
|
|
@ -1998,8 +1998,8 @@ bool MuseScore::savePdf(QList<Score*> cs, const QString& saveName)
|
|||
s->doLayout();
|
||||
s->setPrinting(true);
|
||||
|
||||
const PageFormat* pf = s->pageFormat();
|
||||
printerDev.setPaperSize(pf->size(), QPrinter::Inch);
|
||||
// const PageFormat* pf = s->pageFormat();
|
||||
// printerDev.setPaperSize(pf->size(), QPrinter::Inch);
|
||||
|
||||
const QList<Page*> pl = s->pages();
|
||||
int pages = pl.size();
|
||||
|
|
|
|||
|
|
@ -643,14 +643,13 @@ static void addText2(VBox* vbx, Score* s, QString strTxt, SubStyle stl, Align v,
|
|||
|
||||
static void doCredits(Score* score, const CreditWordsList& credits, const int pageWidth, const int pageHeight)
|
||||
{
|
||||
const PageFormat* pf = score->pageFormat();
|
||||
/*
|
||||
qDebug("MusicXml::doCredits()");
|
||||
qDebug("page format set (inch) w=%g h=%g tm=%g spatium=%g DPMM=%g DPI=%g",
|
||||
pf->width(), pf->height(), pf->oddTopMargin(), score->spatium(), DPMM, DPI);
|
||||
*/
|
||||
// page width, height and odd top margin in tenths
|
||||
const double ph = pf->height() * 10 * DPI / score->spatium();
|
||||
const double ph = score->styleD(StyleIdx::pageHeight) * 10 * DPI / score->spatium();
|
||||
const int pw1 = pageWidth / 3;
|
||||
const int pw2 = pageWidth * 2 / 3;
|
||||
const int ph2 = pageHeight / 2;
|
||||
|
|
@ -1389,8 +1388,8 @@ void MusicXMLParserPass1::defaults(int& pageWidth, int& pageHeight)
|
|||
else if (_e.name() == "page-layout") {
|
||||
PageFormat pf;
|
||||
pageLayout(pf, millimeter / (tenths * INCH), pageWidth, pageHeight);
|
||||
if (preferences.musicxmlImportLayout)
|
||||
_score->setPageFormat(pf);
|
||||
//TODO:ws if (preferences.musicxmlImportLayout)
|
||||
// _score->setPageFormat(pf);
|
||||
}
|
||||
else if (_e.name() == "system-layout") {
|
||||
while (_e.readNextStartElement()) {
|
||||
|
|
@ -1487,18 +1486,18 @@ void MusicXMLParserPass1::pageLayout(PageFormat& pf, const qreal conversion,
|
|||
else
|
||||
skipLogCurrElem();
|
||||
}
|
||||
pf.setTwosided(type == "odd" || type == "even");
|
||||
pf.twosided = type == "odd" || type == "even";
|
||||
if (type == "odd" || type == "both") {
|
||||
pf.setOddLeftMargin(lm);
|
||||
pf.oddLeftMargin = lm;
|
||||
_oddRightMargin = rm;
|
||||
pf.setOddTopMargin(tm);
|
||||
pf.setOddBottomMargin(bm);
|
||||
pf.oddTopMargin = tm;
|
||||
pf.oddBottomMargin = bm;
|
||||
}
|
||||
if (type == "even" || type == "both") {
|
||||
pf.setEvenLeftMargin(lm);
|
||||
pf.evenLeftMargin = lm;
|
||||
_evenRightMargin = rm;
|
||||
pf.setEvenTopMargin(tm);
|
||||
pf.setEvenBottomMargin(bm);
|
||||
pf.evenTopMargin = tm;
|
||||
pf.evenBottomMargin = bm;
|
||||
}
|
||||
}
|
||||
else if (_e.name() == "page-height") {
|
||||
|
|
@ -1516,10 +1515,10 @@ void MusicXMLParserPass1::pageLayout(PageFormat& pf, const qreal conversion,
|
|||
else
|
||||
skipLogCurrElem();
|
||||
}
|
||||
pf.setSize(size);
|
||||
qreal w1 = size.width() - pf.oddLeftMargin() - _oddRightMargin;
|
||||
qreal w2 = size.width() - pf.evenLeftMargin() - _evenRightMargin;
|
||||
pf.setPrintableWidth(qMax(w1, w2)); // silently adjust right margins
|
||||
pf.size = size;
|
||||
qreal w1 = size.width() - pf.oddLeftMargin - _oddRightMargin;
|
||||
qreal w2 = size.width() - pf.evenLeftMargin - _evenRightMargin;
|
||||
pf.printableWidth = qMax(w1, w2); // silently adjust right margins
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -27,6 +27,22 @@
|
|||
|
||||
namespace Ms {
|
||||
|
||||
//---------------------------------------------------------
|
||||
// PageFormat
|
||||
//---------------------------------------------------------
|
||||
|
||||
struct PageFormat {
|
||||
QSizeF size;
|
||||
qreal printableWidth; // _width - left margin - right margin
|
||||
qreal evenLeftMargin; // values in inch
|
||||
qreal oddLeftMargin;
|
||||
qreal evenTopMargin;
|
||||
qreal evenBottomMargin;
|
||||
qreal oddTopMargin;
|
||||
qreal oddBottomMargin;
|
||||
bool twosided;
|
||||
};
|
||||
|
||||
typedef QMap<QString, Part*> PartMap;
|
||||
typedef std::map<int,MusicXmlPartGroup*> MusicXmlPartGroupMap;
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,8 @@ double MagBox::getMag(ScoreView* canvas) const
|
|||
qreal pmag = mscore->physicalDotsPerInch() / DPI;
|
||||
double cw = canvas->width();
|
||||
double ch = canvas->height();
|
||||
const PageFormat* pf = score->pageFormat();
|
||||
qreal pw = score->styleD(StyleIdx::pageWidth);
|
||||
qreal ph = score->styleD(StyleIdx::pageHeight);
|
||||
double nmag;
|
||||
|
||||
switch (idx) {
|
||||
|
|
@ -155,13 +156,13 @@ double MagBox::getMag(ScoreView* canvas) const
|
|||
case MagIdx::MAG_1600: nmag = 16.0 * pmag; break;
|
||||
|
||||
case MagIdx::MAG_PAGE_WIDTH: // page width
|
||||
nmag = cw / (pf->width() * DPI);
|
||||
nmag = cw / (pw * DPI);
|
||||
break;
|
||||
|
||||
case MagIdx::MAG_PAGE: // page
|
||||
{
|
||||
double mag1 = cw / (pf->width() * DPI);
|
||||
double mag2 = ch / (pf->height() * DPI);
|
||||
double mag1 = cw / (pw * DPI);
|
||||
double mag2 = ch / (ph * DPI);
|
||||
nmag = (mag1 > mag2) ? mag2 : mag1;
|
||||
}
|
||||
break;
|
||||
|
|
@ -171,12 +172,12 @@ double MagBox::getMag(ScoreView* canvas) const
|
|||
double mag1 = 0;
|
||||
double mag2 = 0;
|
||||
if (MScore::verticalOrientation()) {
|
||||
mag1 = ch / (pf->height() * 2 * DPI + MScore::verticalPageGap);
|
||||
mag2 = cw / (pf->width() * DPI);
|
||||
mag1 = ch / (ph * 2 * DPI + MScore::verticalPageGap);
|
||||
mag2 = cw / (pw * DPI);
|
||||
}
|
||||
else {
|
||||
mag1 = cw / (pf->width() * 2 * DPI + 50);
|
||||
mag2 = ch / (pf->height() * DPI);
|
||||
mag1 = cw / (pw * 2 * DPI + 50);
|
||||
mag2 = ch / (ph * DPI);
|
||||
}
|
||||
nmag = (mag1 > mag2) ? mag2 : mag1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2461,14 +2461,14 @@ static void loadScores(const QStringList& argv)
|
|||
{
|
||||
MasterScore* score = mscore->readScore(preferences.startScore);
|
||||
if (preferences.startScore.startsWith(":/") && score) {
|
||||
score->setPageFormat(*MScore::defaultStyle().pageFormat());
|
||||
// TODO score->setPageFormat(*MScore::defaultStyle().pageFormat());
|
||||
score->doLayout();
|
||||
score->setCreated(true);
|
||||
}
|
||||
if (score == 0) {
|
||||
score = mscore->readScore(":/data/My_First_Score.mscz");
|
||||
if (score) {
|
||||
score->setPageFormat(*MScore::defaultStyle().pageFormat());
|
||||
// TODO score->setPageFormat(*MScore::defaultStyle().pageFormat());
|
||||
score->doLayout();
|
||||
score->setCreated(true);
|
||||
}
|
||||
|
|
@ -5557,10 +5557,9 @@ int main(int argc, char* av[])
|
|||
MScore::init(); // initialize libmscore
|
||||
if (!MScore::testMode) {
|
||||
QSizeF psf = QPrinter().paperSize(QPrinter::Inch);
|
||||
PageFormat pf;
|
||||
pf.setSize(psf);
|
||||
pf.setPrintableWidth(psf.width() - 20.0 / INCH);
|
||||
MScore::defaultStyle().setPageFormat(pf);
|
||||
MScore::defaultStyle().set(StyleIdx::pageWidth, psf.width());
|
||||
MScore::defaultStyle().set(StyleIdx::pageHeight, psf.height());
|
||||
MScore::defaultStyle().set(StyleIdx::pagePrintableWidth, psf.width()-20.0/INCH);
|
||||
}
|
||||
|
||||
#ifdef SCRIPT_INTERFACE
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@ Score* NoteGroups::createScore(int n, TDuration::DurationType t, std::vector<Cho
|
|||
chord->setBeamMode(_groups.beamMode(tick, t));
|
||||
chords->push_back(chord);
|
||||
}
|
||||
c.score()->pageFormat()->setEvenLeftMargin(0.0);
|
||||
c.score()->pageFormat()->setOddLeftMargin(0.0);
|
||||
c.score()->style().set(StyleIdx::pageEvenLeftMargin, 0.0);
|
||||
c.score()->style().set(StyleIdx::pageOddLeftMargin, 0.0);
|
||||
|
||||
c.score()->parts().front()->setLongName("");
|
||||
c.score()->style().set(StyleIdx::linearStretch, 1.3);
|
||||
|
|
|
|||
|
|
@ -1,21 +1,13 @@
|
|||
//=============================================================================
|
||||
// MuseScore
|
||||
// Linux Music Score Editor
|
||||
// $Id: pagesettings.cpp 5568 2012-04-22 10:08:43Z wschweer $
|
||||
// Music Composition & Notation
|
||||
//
|
||||
// Copyright (C) 2002-2016 Werner Schweer and others
|
||||
// Copyright (C) 2002-2017 Werner Schweer
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License version 2.
|
||||
//
|
||||
// This program 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 this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
// it under the terms of the GNU General Public License version 2
|
||||
// as published by the Free Software Foundation and appearing in
|
||||
// the file LICENCE.GPL
|
||||
//=============================================================================
|
||||
|
||||
#include "globals.h"
|
||||
|
|
@ -65,8 +57,8 @@ PageSettings::PageSettings(QWidget* parent)
|
|||
connect(buttonApply, SIGNAL(clicked()), SLOT(apply()));
|
||||
connect(buttonApplyToAllParts,SIGNAL(clicked()), SLOT(applyToAllParts()));
|
||||
connect(buttonOk, SIGNAL(clicked()), SLOT(ok()));
|
||||
connect(portraitButton, SIGNAL(clicked()), SLOT(portraitClicked()));
|
||||
connect(landscapeButton, SIGNAL(clicked()), SLOT(landscapeClicked()));
|
||||
connect(portraitButton, SIGNAL(clicked()), SLOT(orientationClicked()));
|
||||
connect(landscapeButton, SIGNAL(clicked()), SLOT(orientationClicked()));
|
||||
connect(twosided, SIGNAL(toggled(bool)), SLOT(twosidedToggled(bool)));
|
||||
connect(pageHeight, SIGNAL(valueChanged(double)), SLOT(pageHeightChanged(double)));
|
||||
connect(pageWidth, SIGNAL(valueChanged(double)), SLOT(pageWidthChanged(double)));
|
||||
|
|
@ -121,28 +113,36 @@ void PageSettings::setScore(MasterScore* s)
|
|||
|
||||
void PageSettings::blockSignals(bool block)
|
||||
{
|
||||
oddPageTopMargin->blockSignals(block);
|
||||
oddPageBottomMargin->blockSignals(block);
|
||||
oddPageLeftMargin->blockSignals(block);
|
||||
oddPageRightMargin->blockSignals(block);
|
||||
evenPageTopMargin->blockSignals(block);
|
||||
evenPageBottomMargin->blockSignals(block);
|
||||
evenPageLeftMargin->blockSignals(block);
|
||||
evenPageRightMargin->blockSignals(block);
|
||||
spatiumEntry->blockSignals(block);
|
||||
pageWidth->blockSignals(block);
|
||||
pageHeight->blockSignals(block);
|
||||
for (auto w : { oddPageTopMargin, oddPageBottomMargin, oddPageLeftMargin, oddPageRightMargin,
|
||||
evenPageTopMargin, evenPageBottomMargin, evenPageLeftMargin, evenPageRightMargin, spatiumEntry,
|
||||
pageWidth, pageHeight } )
|
||||
{
|
||||
w->blockSignals(block);
|
||||
}
|
||||
pageOffsetEntry->blockSignals(block);
|
||||
pageGroup->blockSignals(block);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// setMarginsMax
|
||||
//---------------------------------------------------------
|
||||
|
||||
void PageSettings::setMarginsMax(double pw)
|
||||
{
|
||||
oddPageLeftMargin->setMaximum(pw);
|
||||
oddPageRightMargin->setMaximum(pw);
|
||||
evenPageLeftMargin->setMaximum(pw);
|
||||
evenPageRightMargin->setMaximum(pw);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// updateValues
|
||||
// set gui values from style
|
||||
//---------------------------------------------------------
|
||||
|
||||
void PageSettings::updateValues()
|
||||
{
|
||||
Score* sc = preview->score();
|
||||
Score* score = preview->score();
|
||||
bool mm = mmButton->isChecked();
|
||||
|
||||
blockSignals(true);
|
||||
|
|
@ -160,73 +160,44 @@ void PageSettings::updateValues()
|
|||
singleStepSize = 0.05;
|
||||
singleStepScale = 0.005;
|
||||
}
|
||||
oddPageTopMargin->setSuffix(suffix);
|
||||
oddPageTopMargin->setSingleStep(singleStepSize);
|
||||
oddPageBottomMargin->setSuffix(suffix);
|
||||
oddPageBottomMargin->setSingleStep(singleStepSize);
|
||||
oddPageLeftMargin->setSuffix(suffix);
|
||||
oddPageLeftMargin->setSingleStep(singleStepSize);
|
||||
oddPageRightMargin->setSuffix(suffix);
|
||||
oddPageRightMargin->setSingleStep(singleStepSize);
|
||||
evenPageTopMargin->setSuffix(suffix);
|
||||
evenPageTopMargin->setSingleStep(singleStepSize);
|
||||
evenPageBottomMargin->setSuffix(suffix);
|
||||
evenPageBottomMargin->setSingleStep(singleStepSize);
|
||||
evenPageLeftMargin->setSuffix(suffix);
|
||||
evenPageLeftMargin->setSingleStep(singleStepSize);
|
||||
evenPageRightMargin->setSuffix(suffix);
|
||||
evenPageRightMargin->setSingleStep(singleStepSize);
|
||||
spatiumEntry->setSuffix(suffix);
|
||||
for (auto w : { oddPageTopMargin, oddPageBottomMargin, oddPageLeftMargin, oddPageRightMargin, evenPageTopMargin,
|
||||
evenPageBottomMargin, evenPageLeftMargin, evenPageRightMargin, spatiumEntry, pageWidth, pageHeight } )
|
||||
{
|
||||
w->setSuffix(suffix);
|
||||
w->setSingleStep(singleStepSize);
|
||||
}
|
||||
spatiumEntry->setSingleStep(singleStepScale);
|
||||
pageWidth->setSuffix(suffix);
|
||||
pageWidth->setSingleStep(singleStepSize);
|
||||
pageHeight->setSuffix(suffix);
|
||||
pageHeight->setSingleStep(singleStepSize);
|
||||
|
||||
const PageFormat* pf = sc->pageFormat();
|
||||
pageGroup->setCurrentIndex(int(QPageSize::id(pf->size(), QPageSize::Inch, QPageSize::FuzzyOrientationMatch)));
|
||||
double f = mm ? INCH : 1.0;
|
||||
|
||||
qreal widthValue = pf->size().width();
|
||||
if (mm) {
|
||||
oddPageTopMargin->setValue(pf->oddTopMargin() * INCH);
|
||||
oddPageBottomMargin->setValue(pf->oddBottomMargin() * INCH);
|
||||
oddPageLeftMargin->setValue(pf->oddLeftMargin() * INCH);
|
||||
oddPageRightMargin->setValue(pf->oddRightMargin() * INCH);
|
||||
double w = score->styleD(StyleIdx::pageWidth);
|
||||
double h = score->styleD(StyleIdx::pageHeight);
|
||||
setMarginsMax(w * f);
|
||||
|
||||
evenPageTopMargin->setValue(pf->evenTopMargin() * INCH);
|
||||
evenPageBottomMargin->setValue(pf->evenBottomMargin() * INCH);
|
||||
evenPageLeftMargin->setValue(pf->evenLeftMargin() * INCH);
|
||||
evenPageRightMargin->setValue(pf->evenRightMargin() * INCH);
|
||||
double pw = score->styleD(StyleIdx::pagePrintableWidth);
|
||||
pageGroup->setCurrentIndex(int(QPageSize::id(QSizeF(w, h), QPageSize::Inch, QPageSize::FuzzyOrientationMatch)));
|
||||
|
||||
spatiumEntry->setValue(sc->spatium()/DPMM);
|
||||
pageHeight->setValue(pf->size().height() * INCH);
|
||||
widthValue *= INCH;
|
||||
}
|
||||
else {
|
||||
oddPageTopMargin->setValue(pf->oddTopMargin());
|
||||
oddPageBottomMargin->setValue(pf->oddBottomMargin());
|
||||
oddPageLeftMargin->setValue(pf->oddLeftMargin());
|
||||
oddPageRightMargin->setValue(pf->oddRightMargin());
|
||||
oddPageTopMargin->setValue(score->styleD(StyleIdx::pageOddTopMargin) * f);
|
||||
oddPageBottomMargin->setValue(score->styleD(StyleIdx::pageOddBottomMargin) * f);
|
||||
oddPageLeftMargin->setValue(score->styleD(StyleIdx::pageOddLeftMargin) * f);
|
||||
oddPageRightMargin->setValue((w - pw - score->styleD(StyleIdx::pageOddLeftMargin)) * f);
|
||||
|
||||
evenPageTopMargin->setValue(pf->evenTopMargin());
|
||||
evenPageBottomMargin->setValue(pf->evenBottomMargin());
|
||||
evenPageLeftMargin->setValue(pf->evenLeftMargin());
|
||||
evenPageRightMargin->setValue(pf->evenRightMargin());
|
||||
evenPageTopMargin->setValue(score->styleD(StyleIdx::pageEvenTopMargin) * f);
|
||||
evenPageBottomMargin->setValue(score->styleD(StyleIdx::pageEvenBottomMargin) * f);
|
||||
evenPageLeftMargin->setValue(score->styleD(StyleIdx::pageEvenLeftMargin) * f);
|
||||
evenPageRightMargin->setValue((w - pw - score->styleD(StyleIdx::pageEvenLeftMargin)) * f);
|
||||
pageHeight->setValue(h * f);
|
||||
pageWidth->setValue(w * f);
|
||||
|
||||
spatiumEntry->setValue(sc->spatium()/DPI);
|
||||
pageHeight->setValue(pf->size().height());
|
||||
}
|
||||
pageWidth->setValue(widthValue);
|
||||
double f1 = mm ? 1.0/DPMM : 1.0/DPI;
|
||||
spatiumEntry->setValue(score->spatium() * f1);
|
||||
|
||||
oddPageLeftMargin->setMaximum(widthValue);
|
||||
oddPageRightMargin->setMaximum(widthValue);
|
||||
evenPageLeftMargin->setMaximum(widthValue);
|
||||
evenPageRightMargin->setMaximum(widthValue);
|
||||
|
||||
evenPageTopMargin->setEnabled(pf->twosided());
|
||||
evenPageBottomMargin->setEnabled(pf->twosided());
|
||||
evenPageLeftMargin->setEnabled(pf->twosided());
|
||||
evenPageRightMargin->setEnabled(pf->twosided());
|
||||
bool _twosided = score->styleB(StyleIdx::pageTwosided);
|
||||
evenPageTopMargin->setEnabled(_twosided);
|
||||
evenPageBottomMargin->setEnabled(_twosided);
|
||||
evenPageLeftMargin->setEnabled(_twosided);
|
||||
evenPageRightMargin->setEnabled(_twosided);
|
||||
|
||||
if (twosided->isChecked()) {
|
||||
evenPageRightMargin->setValue(oddPageLeftMargin->value());
|
||||
|
|
@ -237,12 +208,12 @@ void PageSettings::updateValues()
|
|||
evenPageLeftMargin->setValue(oddPageLeftMargin->value());
|
||||
}
|
||||
|
||||
landscapeButton->setChecked(pf->width() > pf->height());
|
||||
portraitButton->setChecked(pf->width() <= pf->height());
|
||||
landscapeButton->setChecked(score->styleD(StyleIdx::pageWidth) > score->styleD(StyleIdx::pageHeight));
|
||||
portraitButton->setChecked(score->styleD(StyleIdx::pageWidth) <= score->styleD(StyleIdx::pageHeight));
|
||||
|
||||
twosided->setChecked(pf->twosided());
|
||||
twosided->setChecked(_twosided);
|
||||
|
||||
pageOffsetEntry->setValue(sc->pageNumberOffset() + 1);
|
||||
pageOffsetEntry->setValue(score->pageNumberOffset() + 1);
|
||||
|
||||
blockSignals(false);
|
||||
}
|
||||
|
|
@ -268,30 +239,20 @@ void PageSettings::mmClicked()
|
|||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// portraitClicked
|
||||
// orientationClicked
|
||||
// swap width/height
|
||||
//---------------------------------------------------------
|
||||
|
||||
void PageSettings::portraitClicked()
|
||||
void PageSettings::orientationClicked()
|
||||
{
|
||||
PageFormat pf;
|
||||
double f = mmUnit ? 1.0/INCH : 1.0;
|
||||
pf.setPrintableWidth(pf.width() - (oddPageLeftMargin->value() + oddPageRightMargin->value()) * f);
|
||||
preview->score()->setPageFormat(pf);
|
||||
updateValues();
|
||||
updatePreview(0);
|
||||
}
|
||||
qreal w = preview->score()->styleD(StyleIdx::pageWidth);
|
||||
qreal h = preview->score()->styleD(StyleIdx::pageHeight);
|
||||
|
||||
//---------------------------------------------------------
|
||||
// landscapeClicked
|
||||
//---------------------------------------------------------
|
||||
preview->score()->style().set(StyleIdx::pageWidth, h);
|
||||
preview->score()->style().set(StyleIdx::pageHeight, w);
|
||||
|
||||
void PageSettings::landscapeClicked()
|
||||
{
|
||||
PageFormat pf;
|
||||
pf.setSize(QSizeF(pf.height(), pf.width()));
|
||||
double f = mmUnit ? 1.0/INCH : 1.0;
|
||||
pf.setPrintableWidth(pf.width() - (oddPageLeftMargin->value() + oddPageRightMargin->value()) * f);
|
||||
preview->score()->setPageFormat(pf);
|
||||
double f = mmUnit ? 1.0/INCH : 1.0;
|
||||
preview->score()->style().set(StyleIdx::pagePrintableWidth, h - (oddPageLeftMargin->value() + oddPageRightMargin->value()) * f);
|
||||
updateValues();
|
||||
updatePreview(0);
|
||||
}
|
||||
|
|
@ -302,9 +263,7 @@ void PageSettings::landscapeClicked()
|
|||
|
||||
void PageSettings::twosidedToggled(bool flag)
|
||||
{
|
||||
PageFormat pf = *preview->score()->pageFormat();
|
||||
pf.setTwosided(flag);
|
||||
preview->score()->setPageFormat(pf);
|
||||
preview->score()->style().set(StyleIdx::pageTwosided, flag);
|
||||
updateValues();
|
||||
updatePreview(1);
|
||||
}
|
||||
|
|
@ -325,25 +284,21 @@ void PageSettings::apply()
|
|||
|
||||
void PageSettings::applyToScore(Score* s)
|
||||
{
|
||||
s->startCmd();
|
||||
double f = mmUnit ? 1.0/INCH : 1.0;
|
||||
double f1 = mmUnit ? DPMM : DPI;
|
||||
|
||||
PageFormat pf;
|
||||
s->undoChangeStyleVal(StyleIdx::pageWidth, pageWidth->value() * f);
|
||||
s->undoChangeStyleVal(StyleIdx::pageHeight, pageHeight->value() * f);
|
||||
s->undoChangeStyleVal(StyleIdx::pagePrintableWidth, (pageWidth->value() - oddPageLeftMargin->value() - oddPageRightMargin->value()) * f);
|
||||
s->undoChangeStyleVal(StyleIdx::pageEvenTopMargin, evenPageTopMargin->value() * f);
|
||||
s->undoChangeStyleVal(StyleIdx::pageEvenBottomMargin, evenPageBottomMargin->value() * f);
|
||||
s->undoChangeStyleVal(StyleIdx::pageEvenLeftMargin, evenPageLeftMargin->value() * f);
|
||||
s->undoChangeStyleVal(StyleIdx::pageOddTopMargin, oddPageTopMargin->value() * f);
|
||||
s->undoChangeStyleVal(StyleIdx::pageOddBottomMargin, oddPageBottomMargin->value() * f);
|
||||
s->undoChangeStyleVal(StyleIdx::pageTwosided, twosided->isChecked());
|
||||
s->undoChangeStyleVal(StyleIdx::spatium, spatiumEntry->value() * f1);
|
||||
|
||||
pf.setSize(QSizeF(pageWidth->value(), pageHeight->value()) * f);
|
||||
pf.setPrintableWidth((pageWidth->value() - oddPageLeftMargin->value() - oddPageRightMargin->value()) * f);
|
||||
pf.setEvenTopMargin(evenPageTopMargin->value() * f);
|
||||
pf.setEvenBottomMargin(evenPageBottomMargin->value() * f);
|
||||
pf.setEvenLeftMargin(evenPageLeftMargin->value() * f);
|
||||
pf.setOddTopMargin(oddPageTopMargin->value() * f);
|
||||
pf.setOddBottomMargin(oddPageBottomMargin->value() * f);
|
||||
pf.setOddLeftMargin(oddPageLeftMargin->value() * f);
|
||||
pf.setTwosided(twosided->isChecked());
|
||||
|
||||
double sp = spatiumEntry->value() * f1;
|
||||
|
||||
s->startCmd();
|
||||
s->undoChangePageFormat(&pf, sp, pageOffsetEntry->value()-1);
|
||||
s->endCmd();
|
||||
}
|
||||
|
||||
|
|
@ -384,15 +339,15 @@ void PageSettings::done(int val)
|
|||
void PageSettings::pageFormatSelected(int size)
|
||||
{
|
||||
if (size >= 0) {
|
||||
int id = pageGroup->currentData().toInt();
|
||||
PageFormat pf = *preview->score()->pageFormat();
|
||||
QSizeF s = QPageSize::size(QPageSize::PageSizeId(id), QPageSize::Inch);
|
||||
pf.setSize(s);
|
||||
Score* s = preview->score();
|
||||
int id = pageGroup->currentData().toInt();
|
||||
QSizeF sz = QPageSize::size(QPageSize::PageSizeId(id), QPageSize::Inch);
|
||||
|
||||
s->style().set(StyleIdx::pageWidth, sz.width());
|
||||
s->style().set(StyleIdx::pageHeight, sz.height());
|
||||
|
||||
double f = mmUnit ? 1.0/INCH : 1.0;
|
||||
pf.setPrintableWidth(s.width() - (oddPageLeftMargin->value() + oddPageRightMargin->value()) * f);
|
||||
|
||||
preview->score()->setPageFormat(pf);
|
||||
s->style().set(StyleIdx::pagePrintableWidth, sz.width() - (oddPageLeftMargin->value() + oddPageRightMargin->value()) * f);
|
||||
updateValues();
|
||||
updatePreview(0);
|
||||
}
|
||||
|
|
@ -406,9 +361,7 @@ void PageSettings::otmChanged(double val)
|
|||
{
|
||||
if (mmUnit)
|
||||
val /= INCH;
|
||||
PageFormat pf = *preview->score()->pageFormat();
|
||||
pf.setOddTopMargin(val);
|
||||
preview->score()->setPageFormat(pf);
|
||||
preview->score()->style().set(StyleIdx::pageOddTopMargin, val);
|
||||
updatePreview(1);
|
||||
}
|
||||
|
||||
|
|
@ -421,7 +374,7 @@ void PageSettings::olmChanged(double val)
|
|||
if (mmUnit)
|
||||
val /= INCH;
|
||||
|
||||
if(twosided->isChecked()) {
|
||||
if (twosided->isChecked()) {
|
||||
evenPageRightMargin->blockSignals(true);
|
||||
evenPageRightMargin->setValue(val * (mmUnit ? INCH : 1.0));
|
||||
evenPageRightMargin->blockSignals(false);
|
||||
|
|
@ -431,10 +384,9 @@ void PageSettings::olmChanged(double val)
|
|||
evenPageLeftMargin->setValue(val * (mmUnit ? INCH : 1.0));
|
||||
evenPageLeftMargin->blockSignals(false);
|
||||
}
|
||||
PageFormat pf = *preview->score()->pageFormat();
|
||||
pf.setPrintableWidth(pf.width() - pf.oddRightMargin() - val);
|
||||
pf.setOddLeftMargin(val);
|
||||
preview->score()->setPageFormat(pf);
|
||||
Score* s = preview->score();
|
||||
s->style().set(StyleIdx::pageOddLeftMargin, val);
|
||||
s->style().set(StyleIdx::pagePrintableWidth, s->styleD(StyleIdx::pageWidth) - s->styleD(StyleIdx::pageEvenLeftMargin) - val);
|
||||
|
||||
updatePreview(0);
|
||||
}
|
||||
|
|
@ -448,12 +400,11 @@ void PageSettings::ormChanged(double val)
|
|||
if (mmUnit)
|
||||
val /= INCH;
|
||||
|
||||
PageFormat pf = *preview->score()->pageFormat();
|
||||
|
||||
Score* s = preview->score();
|
||||
if (twosided->isChecked()) {
|
||||
evenPageLeftMargin->blockSignals(true);
|
||||
evenPageLeftMargin->setValue(val * (mmUnit ? INCH : 1.0));
|
||||
pf.setEvenLeftMargin(val);
|
||||
s->style().set(StyleIdx::pageEvenLeftMargin, val);
|
||||
evenPageLeftMargin->blockSignals(false);
|
||||
}
|
||||
else {
|
||||
|
|
@ -461,10 +412,7 @@ void PageSettings::ormChanged(double val)
|
|||
evenPageRightMargin->setValue(val * (mmUnit ? INCH : 1.0));
|
||||
evenPageRightMargin->blockSignals(false);
|
||||
}
|
||||
|
||||
pf.setPrintableWidth(pf.width() - pf.oddLeftMargin() - val);
|
||||
|
||||
preview->score()->setPageFormat(pf);
|
||||
s->style().set(StyleIdx::pagePrintableWidth, s->styleD(StyleIdx::pageWidth) - s->styleD(StyleIdx::pageOddLeftMargin) - val);
|
||||
updatePreview(0);
|
||||
}
|
||||
|
||||
|
|
@ -476,10 +424,7 @@ void PageSettings::obmChanged(double val)
|
|||
{
|
||||
if (mmUnit)
|
||||
val /= INCH;
|
||||
PageFormat pf = *preview->score()->pageFormat();
|
||||
pf.setOddBottomMargin(val);
|
||||
preview->score()->setPageFormat(pf);
|
||||
|
||||
preview->score()->style().set(StyleIdx::pageOddBottomMargin, val);
|
||||
updatePreview(1);
|
||||
}
|
||||
|
||||
|
|
@ -491,10 +436,7 @@ void PageSettings::etmChanged(double val)
|
|||
{
|
||||
if (mmUnit)
|
||||
val /= INCH;
|
||||
PageFormat pf = *preview->score()->pageFormat();
|
||||
pf.setEvenTopMargin(val);
|
||||
preview->score()->setPageFormat(pf);
|
||||
|
||||
preview->score()->style().set(StyleIdx::pageEvenTopMargin, val);
|
||||
updatePreview(1);
|
||||
}
|
||||
|
||||
|
|
@ -504,19 +446,17 @@ void PageSettings::etmChanged(double val)
|
|||
|
||||
void PageSettings::elmChanged(double val)
|
||||
{
|
||||
if (mmUnit)
|
||||
val /= INCH;
|
||||
double f = mmUnit ? 1.0/INCH : 1.0;
|
||||
val *= f;
|
||||
|
||||
if(twosided->isChecked()) {
|
||||
if (twosided->isChecked()) {
|
||||
oddPageRightMargin->blockSignals(true);
|
||||
oddPageRightMargin->setValue(val * (mmUnit ? INCH : 1.0));
|
||||
oddPageRightMargin->blockSignals(false);
|
||||
}
|
||||
PageFormat pf = *preview->score()->pageFormat();
|
||||
pf.setPrintableWidth(pf.width() - pf.evenRightMargin() - val);
|
||||
pf.setEvenLeftMargin(val);
|
||||
preview->score()->setPageFormat(pf);
|
||||
|
||||
Score* s = preview->score();
|
||||
s->style().set(StyleIdx::pageEvenLeftMargin, val);
|
||||
s->style().set(StyleIdx::pagePrintableWidth, s->styleD(StyleIdx::pageWidth) - evenPageRightMargin->value() * f - val);
|
||||
updatePreview(0);
|
||||
}
|
||||
|
||||
|
|
@ -534,11 +474,9 @@ void PageSettings::ermChanged(double val)
|
|||
oddPageLeftMargin->setValue(val * (mmUnit ? INCH : 1.0));
|
||||
oddPageLeftMargin->blockSignals(false);
|
||||
}
|
||||
|
||||
PageFormat pf = *preview->score()->pageFormat();
|
||||
pf.setPrintableWidth(pf.width() - pf.evenLeftMargin() - val);
|
||||
pf.setOddLeftMargin(val);
|
||||
preview->score()->setPageFormat(pf);
|
||||
Score* s = preview->score();
|
||||
s->style().set(StyleIdx::pagePrintableWidth, s->styleD(StyleIdx::pageWidth) - s->styleD(StyleIdx::pageEvenLeftMargin) - val);
|
||||
s->style().set(StyleIdx::pageOddLeftMargin, val);
|
||||
updatePreview(0);
|
||||
}
|
||||
|
||||
|
|
@ -550,9 +488,7 @@ void PageSettings::ebmChanged(double val)
|
|||
{
|
||||
if (mmUnit)
|
||||
val /= INCH;
|
||||
PageFormat pf = *preview->score()->pageFormat();
|
||||
pf.setEvenBottomMargin(val);
|
||||
preview->score()->setPageFormat(pf);
|
||||
preview->score()->style().set(StyleIdx::pageEvenBottomMargin, val);
|
||||
updatePreview(1);
|
||||
}
|
||||
|
||||
|
|
@ -591,9 +527,8 @@ void PageSettings::pageHeightChanged(double val)
|
|||
val2 /= INCH;
|
||||
}
|
||||
pageGroup->setCurrentIndex(0); // custom
|
||||
PageFormat f = *preview->score()->pageFormat();
|
||||
f.setSize(QSizeF(val2, val));
|
||||
preview->score()->setPageFormat(f);
|
||||
preview->score()->style().set(StyleIdx::pageWidth, val);
|
||||
preview->score()->style().set(StyleIdx::pageHeight, val2);
|
||||
|
||||
updatePreview(1);
|
||||
}
|
||||
|
|
@ -604,22 +539,15 @@ void PageSettings::pageHeightChanged(double val)
|
|||
|
||||
void PageSettings::pageWidthChanged(double val)
|
||||
{
|
||||
double val2 = pageHeight->value();
|
||||
setMarginsMax(val);
|
||||
|
||||
oddPageLeftMargin->setMaximum(val);
|
||||
oddPageRightMargin->setMaximum(val);
|
||||
evenPageLeftMargin->setMaximum(val);
|
||||
evenPageRightMargin->setMaximum(val);
|
||||
|
||||
if (mmUnit) {
|
||||
val /= INCH;
|
||||
val2 /= INCH;
|
||||
}
|
||||
double f = mmUnit ? 1.0/INCH : 1.0;
|
||||
double val2 = pageHeight->value() * f;
|
||||
val *= f;
|
||||
pageGroup->setCurrentIndex(0); // custom
|
||||
PageFormat f = *preview->score()->pageFormat();
|
||||
f.setSize(QSizeF(val, val2));
|
||||
preview->score()->setPageFormat(f);
|
||||
|
||||
preview->score()->style().set(StyleIdx::pageWidth, val);
|
||||
preview->score()->style().set(StyleIdx::pageHeight, val2);
|
||||
preview->score()->style().set(StyleIdx::pagePrintableWidth, val - (oddPageLeftMargin->value() + evenPageLeftMargin->value()) * f);
|
||||
updatePreview(0);
|
||||
}
|
||||
|
||||
|
|
@ -629,13 +557,13 @@ void PageSettings::pageWidthChanged(double val)
|
|||
|
||||
void PageSettings::updatePreview(int val)
|
||||
{
|
||||
// updateValues();
|
||||
updateValues();
|
||||
switch(val) {
|
||||
case 0:
|
||||
preview->score()->doLayout();
|
||||
break;
|
||||
case 1:
|
||||
//TODO-ws preview->score()->doLayoutPages();
|
||||
preview->score()->doLayout();
|
||||
break;
|
||||
}
|
||||
preview->layoutChanged();
|
||||
|
|
|
|||
|
|
@ -1,21 +1,13 @@
|
|||
//=============================================================================
|
||||
// MusE Score
|
||||
// Linux Music Score Editor
|
||||
// $Id: pagesettings.h 4998 2011-11-17 11:04:44Z wschweer $
|
||||
// MuseScore
|
||||
// Music Composition & Notation
|
||||
//
|
||||
// Copyright (C) 2002-2016 Werner Schweer and others
|
||||
// Copyright (C) 2002-2017 Werner Schweer
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License version 2.
|
||||
//
|
||||
// This program 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 this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
// it under the terms of the GNU General Public License version 2
|
||||
// as published by the Free Software Foundation and appearing in
|
||||
// the file LICENCE.GPL
|
||||
//=============================================================================
|
||||
|
||||
#ifndef __PAGESETTINGS_H__
|
||||
|
|
@ -46,6 +38,7 @@ class PageSettings : public AbstractDialog, private Ui::PageSettingsBase {
|
|||
void updatePreview(int);
|
||||
void blockSignals(bool);
|
||||
void applyToScore(Score*);
|
||||
void setMarginsMax(double);
|
||||
|
||||
private slots:
|
||||
void mmClicked();
|
||||
|
|
@ -70,8 +63,7 @@ class PageSettings : public AbstractDialog, private Ui::PageSettingsBase {
|
|||
void pageHeightChanged(double);
|
||||
void pageWidthChanged(double);
|
||||
void pageOffsetChanged(int val);
|
||||
void portraitClicked();
|
||||
void landscapeClicked();
|
||||
void orientationClicked();
|
||||
|
||||
protected:
|
||||
virtual void retranslate() { retranslateUi(this); }
|
||||
|
|
|
|||
|
|
@ -296,10 +296,10 @@ void Preferences::write()
|
|||
s.setValue("pngTransparent", pngTransparent);
|
||||
s.setValue("language", language);
|
||||
|
||||
s.setValue("paperWidth", MScore::defaultStyle().pageFormat()->width());
|
||||
s.setValue("paperHeight", MScore::defaultStyle().pageFormat()->height());
|
||||
s.setValue("paperWidth", MScore::defaultStyle().value(StyleIdx::pageWidth).toReal());
|
||||
s.setValue("paperHeight", MScore::defaultStyle().value(StyleIdx::pageHeight).toReal());
|
||||
|
||||
s.setValue("twosided", MScore::defaultStyle().pageFormat()->twosided());
|
||||
s.setValue("twosided", MScore::defaultStyle().value(StyleIdx::pageTwosided).toBool());
|
||||
s.setValue("spatium", MScore::defaultStyle().value(StyleIdx::spatium).toDouble() / DPI);
|
||||
|
||||
s.setValue("mag", mag);
|
||||
|
|
@ -1911,9 +1911,10 @@ void Preferences::updatePluginList()
|
|||
void PreferenceDialog::printShortcutsClicked()
|
||||
{
|
||||
QPrinter printer(QPrinter::HighResolution);
|
||||
MStyle* s = &MScore::defaultStyle();
|
||||
const PageFormat* pf = s->pageFormat();
|
||||
printer.setPaperSize(pf->size(), QPrinter::Inch);
|
||||
MStyle& s = MScore::defaultStyle();
|
||||
qreal pageW = s.value(StyleIdx::pageWidth).toReal();
|
||||
qreal pageH = s.value(StyleIdx::pageHeight).toReal();
|
||||
printer.setPaperSize(QSizeF(pageW, pageH), QPrinter::Inch);
|
||||
|
||||
printer.setCreator("MuseScore Version: " VERSION);
|
||||
printer.setFullPage(true);
|
||||
|
|
|
|||
|
|
@ -6,22 +6,6 @@
|
|||
<Division>480</Division>
|
||||
<Style>
|
||||
<chordsXmlFile>1</chordsXmlFile>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.666667</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.8</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.666667</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.8</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.666667</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.8</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.666667</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.8</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.666667</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.8</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.666667</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.8</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.666667</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.8</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.666667</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.8</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.62766</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.88</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.666667</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.8</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.666667</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.8</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
<maxSystemDistance>12</maxSystemDistance>
|
||||
<measureSpacing>1</measureSpacing>
|
||||
<smallStaffMag>0.681818</smallStaffMag>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
|
|
@ -5,22 +5,6 @@
|
|||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</Spatium>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue